diff --git a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
index 0011bf1987..d3dfe09842 100644
--- a/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
+++ b/vector/src/main/res/layout/bottom_sheet_bootstrap.xml
@@ -24,9 +24,10 @@
             android:importantForAccessibility="no"
             android:scaleType="fitCenter"
             android:src="@drawable/ic_security_key_24dp"
-            android:tint="?riotx_text_primary"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="?riotx_text_primary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/bootstrapTitleText"
diff --git a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
index 4f528e6ef4..e25b86bcd6 100644
--- a/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
+++ b/vector/src/main/res/layout/bottom_sheet_save_recovery_key.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -46,7 +47,8 @@
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="16dp"
             android:src="@drawable/ic_material_share"
-            android:tint="?colorAccent" />
+            app:tint="?colorAccent"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -76,7 +78,8 @@
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="16dp"
             android:src="@drawable/ic_material_save"
-            android:tint="?colorAccent" />
+            app:tint="?colorAccent"
+            tools:ignore="MissingPrefix" />
 
         <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 9b84f0292f..ac67db6a64 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,11 +75,11 @@
         android:layout_marginTop="8dp"
         android:layout_marginBottom="38dp"
         android:alpha="0"
-        android:tint="?riotx_text_primary"
         app:layout_constraintEnd_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="parent"
-        tools:ignore="MissingConstraints"
-        tools:src="@drawable/ic_edit" />
+        tools:ignore="MissingConstraints,MissingPrefix"
+        tools:src="@drawable/ic_edit"
+        app:tint="?riotx_text_primary" />
 
 
     <ImageButton
@@ -88,11 +88,12 @@
         android:layout_height="22dp"
         android:background="?android:attr/selectableItemBackground"
         android:src="@drawable/ic_close_round"
-        android:tint="@color/riotx_notice"
+        app:tint="@color/riotx_notice"
         android:visibility="invisible"
         app:layout_constraintBottom_toTopOf="parent"
         app:layout_constraintStart_toEndOf="parent"
-        tools:visibility="visible" />
+        tools:visibility="visible"
+        tools:ignore="MissingPrefix" />
 
     <ImageView
         android:id="@+id/composer_avatar_view"
@@ -130,10 +131,11 @@
         android:layout_height="48dp"
         android:background="?android:attr/selectableItemBackground"
         android:src="@drawable/ic_attachment"
-        android:tint="?attr/colorAccent"
+        app:tint="?attr/colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/sendButton"
-        app:layout_constraintStart_toEndOf="@id/composerEditText" />
+        app:layout_constraintStart_toEndOf="@id/composerEditText"
+        tools:ignore="MissingPrefix" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/composer_preview_barrier"
@@ -151,10 +153,11 @@
         android:layout_height="48dp"
         android:background="?android:attr/selectableItemBackground"
         android:src="@drawable/ic_send"
-        android:tint="?attr/colorAccent"
+        app:tint="?attr/colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/attachmentButton" />
+        app:layout_constraintStart_toEndOf="@id/attachmentButton"
+        tools:ignore="MissingPrefix" />
 
     <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
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 00f1830b1d..cd4d48c056 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
@@ -79,12 +79,13 @@
         android:layout_marginTop="6dp"
         android:layout_marginBottom="38dp"
         android:alpha="1"
-        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"
         app:layout_constraintTop_toBottomOf="@id/composer_related_message_avatar_view"
-        tools:src="@drawable/ic_edit" />
+        tools:src="@drawable/ic_edit"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
 
     <ImageButton
@@ -93,10 +94,11 @@
         android:layout_height="48dp"
         android:background="?android:attr/selectableItemBackground"
         android:src="@drawable/ic_close_round"
-        android:tint="@color/riotx_notice"
+        app:tint="@color/riotx_notice"
         app:layout_constraintBottom_toBottomOf="@id/composer_related_message_preview"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/composer_related_message_preview" />
+        app:layout_constraintTop_toTopOf="@id/composer_related_message_preview"
+        tools:ignore="MissingPrefix" />
 
 
     <ImageView
@@ -136,9 +138,10 @@
         android:layout_height="48dp"
         android:background="?android:attr/selectableItemBackground"
         android:src="@drawable/ic_attachment"
-        android:tint="?attr/colorAccent"
+        app:tint="?attr/colorAccent"
         app:layout_constraintEnd_toStartOf="@+id/sendButton"
-        app:layout_constraintTop_toBottomOf="parent" />
+        app:layout_constraintTop_toBottomOf="parent"
+        tools:ignore="MissingPrefix" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/composer_preview_barrier"
@@ -156,12 +159,13 @@
         android:layout_height="48dp"
         android:background="?android:attr/selectableItemBackground"
         android:src="@drawable/ic_send"
-        android:tint="?attr/colorAccent"
+        app:tint="?attr/colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/composerEditText"
         app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"
-        app:layout_constraintVertical_bias="1" />
+        app:layout_constraintVertical_bias="1"
+        tools:ignore="MissingPrefix" />
 
     <im.vector.app.features.home.room.detail.composer.ComposerEditText
         android:id="@+id/composerEditText"
diff --git a/vector/src/main/res/layout/custom_action_item_layout_badge.xml b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
index f47eaa5d1a..4d1d398559 100644
--- a/vector/src/main/res/layout/custom_action_item_layout_badge.xml
+++ b/vector/src/main/res/layout/custom_action_item_layout_badge.xml
@@ -13,11 +13,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_integrations"
-        android:tint="@color/riotx_accent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="@color/riotx_accent"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/cart_badge"
diff --git a/vector/src/main/res/layout/dialog_change_password.xml b/vector/src/main/res/layout/dialog_change_password.xml
index c1213aacfd..afcb4047c4 100644
--- a/vector/src/main/res/layout/dialog_change_password.xml
+++ b/vector/src/main/res/layout/dialog_change_password.xml
@@ -29,7 +29,8 @@
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
             android:src="@drawable/ic_eye"
-            android:tint="?attr/colorAccent" />
+            app:tint="?attr/colorAccent"
+            tools:ignore="MissingPrefix" />
 
     </LinearLayout>
 
diff --git a/vector/src/main/res/layout/dialog_disclaimer_content.xml b/vector/src/main/res/layout/dialog_disclaimer_content.xml
index 541b75e7c7..89fa1395b9 100644
--- a/vector/src/main/res/layout/dialog_disclaimer_content.xml
+++ b/vector/src/main/res/layout/dialog_disclaimer_content.xml
@@ -26,7 +26,8 @@
             android:layout_height="wrap_content"
             android:layout_margin="32dp"
             android:src="@drawable/ic_arrow_right"
-            android:tint="?riotx_text_secondary" />
+            app:tint="?riotx_text_secondary"
+            tools:ignore="MissingPrefix" />
 
         <ImageView
             android:layout_width="wrap_content"
diff --git a/vector/src/main/res/layout/dialog_export_e2e_keys.xml b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
index 67ccd89b11..c9d0ac9c8c 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/layout_root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -27,10 +28,11 @@
         android:background="?attr/selectableItemBackground"
         android:scaleType="center"
         android:src="@drawable/ic_eye"
-        android:tint="?attr/colorAccent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/exportDialogTil"
-        app:layout_constraintTop_toTopOf="@id/exportDialogTil" />
+        app:layout_constraintTop_toTopOf="@id/exportDialogTil"
+        app:tint="?attr/colorAccent"
+        tools:ignore="MissingPrefix" />
 
 
     <com.google.android.material.textfield.TextInputLayout
diff --git a/vector/src/main/res/layout/dialog_import_e2e_keys.xml b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
index 8648071d00..dc0e50eaff 100644
--- a/vector/src/main/res/layout/dialog_import_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
@@ -52,10 +52,11 @@
         android:background="?attr/selectableItemBackground"
         android:scaleType="center"
         android:src="@drawable/ic_eye"
-        android:tint="?attr/colorAccent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/importDialogTil"
-        app:layout_constraintTop_toTopOf="@id/importDialogTil" />
+        app:layout_constraintTop_toTopOf="@id/importDialogTil"
+        app:tint="?attr/colorAccent"
+        tools:ignore="MissingPrefix" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/dialog_e2e_keys_import_button"
diff --git a/vector/src/main/res/layout/dialog_prompt_password.xml b/vector/src/main/res/layout/dialog_prompt_password.xml
index 081ce9cdae..8d96d8c68e 100644
--- a/vector/src/main/res/layout/dialog_prompt_password.xml
+++ b/vector/src/main/res/layout/dialog_prompt_password.xml
@@ -56,8 +56,9 @@
                 android:background="?attr/selectableItemBackground"
                 android:scaleType="center"
                 android:src="@drawable/ic_eye"
-                android:tint="?attr/colorAccent"
-                tools:contentDescription="@string/a11y_show_password" />
+                tools:contentDescription="@string/a11y_show_password"
+                app:tint="?attr/colorAccent"
+                tools:ignore="MissingPrefix" />
 
         </FrameLayout>
 
diff --git a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
index 36c9a68077..b131d45495 100644
--- a/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
+++ b/vector/src/main/res/layout/dialog_recovery_key_saved_info.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/layout_root"
     android:layout_width="match_parent"
@@ -28,7 +29,8 @@
                 android:importantForAccessibility="no"
                 android:scaleType="fitCenter"
                 android:src="@drawable/ic_security_key_24dp"
-                android:tint="?riotx_text_primary" />
+                app:tint="?riotx_text_primary"
+                tools:ignore="MissingPrefix" />
 
             <TextView
                 android:id="@+id/bootstrapTitleText"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
index a0d4960f72..cc1e809a6c 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_account_password.xml
@@ -51,10 +51,11 @@
         android:background="?attr/selectableItemBackground"
         android:scaleType="center"
         android:src="@drawable/ic_eye"
-        android:tint="?colorAccent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/bootstrapAccountPasswordTil"
-        app:layout_constraintTop_toTopOf="@+id/bootstrapAccountPasswordTil" />
+        app:layout_constraintTop_toTopOf="@+id/bootstrapAccountPasswordTil"
+        app:tint="?colorAccent"
+        tools:ignore="MissingPrefix" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/bootstrapPasswordButton"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
index 94c8de9650..41b6c9b48c 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_enter_passphrase.xml
@@ -71,10 +71,11 @@
         android:background="?attr/selectableItemBackground"
         android:scaleType="center"
         android:src="@drawable/ic_eye"
-        android:tint="?colorAccent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/ssss_passphrase_enter_til"
-        app:layout_constraintTop_toTopOf="@+id/ssss_passphrase_enter_til" />
+        app:layout_constraintTop_toTopOf="@+id/ssss_passphrase_enter_til"
+        app:tint="?colorAccent"
+        tools:ignore="MissingPrefix" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/bootstrapSubmit"
diff --git a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
index 720dd80901..770fc405a7 100644
--- a/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
+++ b/vector/src/main/res/layout/fragment_bootstrap_migrate_backup.xml
@@ -71,10 +71,11 @@
         android:background="?attr/selectableItemBackground"
         android:scaleType="center"
         android:src="@drawable/ic_eye"
-        android:tint="?colorAccent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/bootstrapRecoveryKeyEnterTil"
-        app:layout_constraintTop_toTopOf="@+id/bootstrapRecoveryKeyEnterTil" />
+        app:layout_constraintTop_toTopOf="@+id/bootstrapRecoveryKeyEnterTil"
+        app:tint="?colorAccent"
+        tools:ignore="MissingPrefix" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/bootstrapMigrateContinueButton"
diff --git a/vector/src/main/res/layout/fragment_deactivate_account.xml b/vector/src/main/res/layout/fragment_deactivate_account.xml
index a03f4dba00..db85c607e1 100644
--- a/vector/src/main/res/layout/fragment_deactivate_account.xml
+++ b/vector/src/main/res/layout/fragment_deactivate_account.xml
@@ -86,8 +86,9 @@
                 android:background="?attr/selectableItemBackground"
                 android:scaleType="center"
                 android:src="@drawable/ic_eye"
-                android:tint="?attr/colorAccent"
-                tools:contentDescription="@string/a11y_show_password" />
+                tools:contentDescription="@string/a11y_show_password"
+                app:tint="?attr/colorAccent"
+                tools:ignore="MissingPrefix" />
 
         </FrameLayout>
 
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 12562bc98a..d34ea0b815 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -24,9 +24,10 @@
             android:layout_height="@dimen/layout_touch_size"
             android:scaleType="center"
             android:src="@drawable/ic_settings_x"
-            android:tint="@color/riotx_accent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="@color/riotx_accent"
+            tools:ignore="MissingPrefix" />
 
         <ImageView
             android:id="@+id/homeDrawerHeaderAvatarView"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
index cdbc6d11de..10f953bdf5 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_key.xml
@@ -17,10 +17,11 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="36dp"
             android:src="@drawable/key_big"
-            android:tint="?riotx_text_primary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="?riotx_text_primary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/keys_restore_with_key"
@@ -68,10 +69,11 @@
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
             android:src="@drawable/ic_import_black"
-            android:tint="?attr/colorAccent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/keys_backup_key_enter_til"
-            app:layout_constraintTop_toTopOf="@id/keys_backup_key_enter_til" />
+            app:layout_constraintTop_toTopOf="@id/keys_backup_key_enter_til"
+            app:tint="?attr/colorAccent"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/keys_restore_key_help_with_link"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
index 4a963c590e..ffa1296494 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_from_passphrase.xml
@@ -17,10 +17,11 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="36dp"
             android:src="@drawable/key_big"
-            android:tint="?riotx_text_primary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+            app:layout_constraintTop_toTopOf="parent"
+            app:tint="?riotx_text_primary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/keys_backup_restore_with_passphrase"
@@ -68,10 +69,11 @@
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
             android:src="@drawable/ic_eye"
-            android:tint="?colorAccent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/keys_backup_passphrase_enter_til"
-            app:layout_constraintTop_toTopOf="@+id/keys_backup_passphrase_enter_til" />
+            app:layout_constraintTop_toTopOf="@+id/keys_backup_passphrase_enter_til"
+            app:tint="?colorAccent"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/keys_backup_passphrase_help_with_link"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
index 9e056aacea..f5ce626c8f 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_restore_success.xml
@@ -12,10 +12,11 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="36dp"
         android:src="@drawable/key_big"
-        android:tint="?riotx_text_primary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/keys_backup_restore_success"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
index d9b6275e61..29d2137ddd 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step1.xml
@@ -13,13 +13,14 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/layout_vertical_margin"
         android:src="@drawable/backup_keys"
-        android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toTopOf="@+id/keys_backup_setup_step1_title"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintVertical_bias="0.1"
-        app:layout_constraintVertical_chainStyle="spread" />
+        app:layout_constraintVertical_chainStyle="spread"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/keys_backup_setup_step1_title"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
index fe8db20f4e..6615b845df 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step2.xml
@@ -76,10 +76,11 @@
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
             android:src="@drawable/ic_eye"
-            android:tint="?attr/colorAccent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/keys_backup_passphrase_enter_til"
-            app:layout_constraintTop_toTopOf="@id/keys_backup_passphrase_enter_til" />
+            app:layout_constraintTop_toTopOf="@id/keys_backup_passphrase_enter_til"
+            app:tint="?attr/colorAccent"
+            tools:ignore="MissingPrefix" />
 
         <im.vector.app.core.ui.views.PasswordStrengthBar
             android:id="@+id/keys_backup_passphrase_security_progress"
diff --git a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
index 7d3d821daf..2fa2f17a6a 100644
--- a/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
+++ b/vector/src/main/res/layout/fragment_keys_backup_setup_step3.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/keys_backup_root"
     android:layout_width="match_parent"
@@ -20,7 +21,8 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="60dp"
             android:src="@drawable/backup_keys"
-            android:tint="?riotx_text_primary" />
+            app:tint="?riotx_text_primary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/keys_backup_setup_step3_success_title"
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index 6300d6cb41..ca7d267c80 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -19,8 +19,9 @@
                 android:id="@+id/loginServerIcon"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:tint="?riotx_text_primary"
-                tools:src="@drawable/ic_logo_matrix_org" />
+                tools:src="@drawable/ic_logo_matrix_org"
+                app:tint="?riotx_text_primary"
+                tools:ignore="MissingPrefix" />
 
             <TextView
                 android:id="@+id/loginTitle"
@@ -94,8 +95,9 @@
                     android:background="?attr/selectableItemBackground"
                     android:scaleType="center"
                     android:src="@drawable/ic_eye"
-                    android:tint="?attr/colorAccent"
-                    tools:contentDescription="@string/a11y_show_password" />
+                    tools:contentDescription="@string/a11y_show_password"
+                    app:tint="?attr/colorAccent"
+                    tools:ignore="MissingPrefix" />
 
             </FrameLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_reset_password.xml b/vector/src/main/res/layout/fragment_login_reset_password.xml
index 341435bdc4..5da5298b3d 100644
--- a/vector/src/main/res/layout/fragment_login_reset_password.xml
+++ b/vector/src/main/res/layout/fragment_login_reset_password.xml
@@ -84,8 +84,9 @@
                     android:background="?attr/selectableItemBackground"
                     android:scaleType="center"
                     android:src="@drawable/ic_eye"
-                    android:tint="?attr/colorAccent"
-                    tools:contentDescription="@string/a11y_show_password" />
+                    tools:contentDescription="@string/a11y_show_password"
+                    app:tint="?attr/colorAccent"
+                    tools:ignore="MissingPrefix" />
 
             </FrameLayout>
 
diff --git a/vector/src/main/res/layout/fragment_login_server_selection.xml b/vector/src/main/res/layout/fragment_login_server_selection.xml
index 00fcfa9183..b2046b73ee 100644
--- a/vector/src/main/res/layout/fragment_login_server_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_server_selection.xml
@@ -62,11 +62,12 @@
                     android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
                     android:src="@drawable/ic_logo_matrix_org"
-                    android:tint="?riotx_text_primary"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceMatrixOrgText"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_chainStyle="packed" />
+                    app:layout_constraintVertical_chainStyle="packed"
+                    app:tint="?riotx_text_primary"
+                    tools:ignore="MissingPrefix" />
 
                 <TextView
                     android:id="@+id/loginServerChoiceMatrixOrgText"
@@ -103,11 +104,12 @@
                     android:layout_height="wrap_content"
                     android:importantForAccessibility="no"
                     android:src="@drawable/ic_logo_element_matrix_services"
-                    android:tint="?riotx_text_primary"
                     app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceEmsText"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
-                    app:layout_constraintVertical_chainStyle="packed" />
+                    app:layout_constraintVertical_chainStyle="packed"
+                    app:tint="?riotx_text_primary"
+                    tools:ignore="MissingPrefix" />
 
                 <TextView
                     android:id="@+id/loginServerChoiceEmsText"
diff --git a/vector/src/main/res/layout/fragment_login_server_url_form.xml b/vector/src/main/res/layout/fragment_login_server_url_form.xml
index 94f724b12a..37122e8e43 100644
--- a/vector/src/main/res/layout/fragment_login_server_url_form.xml
+++ b/vector/src/main/res/layout/fragment_login_server_url_form.xml
@@ -22,7 +22,8 @@
                 android:layout_height="wrap_content"
                 android:importantForAccessibility="no"
                 android:src="@drawable/ic_logo_element_matrix_services"
-                android:tint="?riotx_text_primary" />
+                app:tint="?riotx_text_primary"
+                tools:ignore="MissingPrefix" />
 
             <TextView
                 android:id="@+id/loginServerUrlFormTitle"
diff --git a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
index c0efe15074..60887e1e69 100644
--- a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
@@ -23,12 +23,13 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="36dp"
                 android:importantForAccessibility="no"
-                android:tint="?riotx_text_primary"
                 android:visibility="gone"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/loginLogo"
                 tools:src="@drawable/ic_logo_matrix_org"
-                tools:visibility="visible" />
+                tools:visibility="visible"
+                app:tint="?riotx_text_primary"
+                tools:ignore="MissingPrefix,UnknownId" />
 
             <TextView
                 android:id="@+id/loginSignupSigninTitle"
diff --git a/vector/src/main/res/layout/fragment_login_splash.xml b/vector/src/main/res/layout/fragment_login_splash.xml
index 62e61a4219..fe845cd20e 100644
--- a/vector/src/main/res/layout/fragment_login_splash.xml
+++ b/vector/src/main/res/layout/fragment_login_splash.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?riotx_background"
@@ -44,7 +45,8 @@
             android:layout_height="44dp"
             android:layout_marginTop="8dp"
             android:src="@drawable/element_logotype"
-            android:tint="?colorAccent" />
+            app:tint="?colorAccent"
+            tools:ignore="MissingPrefix" />
 
     </LinearLayout>
 
@@ -93,9 +95,10 @@
             android:layout_marginStart="2dp"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_login_splash_message_circle"
-            android:tint="?riotx_text_secondary"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/loginSplashText1" />
+            app:layout_constraintTop_toTopOf="@+id/loginSplashText1"
+            app:tint="?riotx_text_secondary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/loginSplashText1"
@@ -116,9 +119,10 @@
             android:layout_height="wrap_content"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_login_splash_lock"
-            android:tint="?riotx_text_secondary"
             app:layout_constraintStart_toStartOf="@id/loginSplashPicto1"
-            app:layout_constraintTop_toTopOf="@+id/loginSplashText2" />
+            app:layout_constraintTop_toTopOf="@+id/loginSplashText2"
+            app:tint="?riotx_text_secondary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/loginSplashText2"
@@ -139,9 +143,10 @@
             android:layout_height="wrap_content"
             android:importantForAccessibility="no"
             android:src="@drawable/ic_login_splash_sliders"
-            android:tint="?riotx_text_secondary"
             app:layout_constraintStart_toStartOf="@+id/loginSplashPicto1"
-            app:layout_constraintTop_toTopOf="@+id/loginSplashText3" />
+            app:layout_constraintTop_toTopOf="@+id/loginSplashText3"
+            app:tint="?riotx_text_secondary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/loginSplashText3"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
index bbe9282cc1..8f8cd59eb1 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_key.xml
@@ -16,10 +16,11 @@
             android:layout_height="24dp"
             android:layout_marginStart="16dp"
             android:src="@drawable/ic_security_key_24dp"
-            android:tint="?riotx_text_primary"
             app:layout_constraintBottom_toBottomOf="@+id/ssss_restore_with_key"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_key" />
+            app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_key"
+            app:tint="?riotx_text_primary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/ssss_restore_with_key"
diff --git a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
index 09bd823257..3c5ed1c757 100644
--- a/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
+++ b/vector/src/main/res/layout/fragment_ssss_access_from_passphrase.xml
@@ -16,10 +16,11 @@
             android:layout_height="24dp"
             android:layout_marginStart="16dp"
             android:src="@drawable/ic_security_phrase_24dp"
-            android:tint="?riotx_text_primary"
             app:layout_constraintBottom_toBottomOf="@+id/ssss_restore_with_passphrase"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_passphrase" />
+            app:layout_constraintTop_toTopOf="@+id/ssss_restore_with_passphrase"
+            app:tint="?riotx_text_primary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/ssss_restore_with_passphrase"
@@ -83,10 +84,11 @@
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
             android:src="@drawable/ic_eye"
-            android:tint="?colorAccent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/ssss_passphrase_enter_til"
-            app:layout_constraintTop_toTopOf="@+id/ssss_passphrase_enter_til" />
+            app:layout_constraintTop_toTopOf="@+id/ssss_passphrase_enter_til"
+            app:tint="?colorAccent"
+            tools:ignore="MissingPrefix" />
 
         <!--        -->
 
diff --git a/vector/src/main/res/layout/item_bottom_sheet_action.xml b/vector/src/main/res/layout/item_bottom_sheet_action.xml
index 2d10d513ab..8b5716cd8e 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_action.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_action.xml
@@ -30,11 +30,12 @@
         android:layout_centerVertical="true"
         android:layout_toEndOf="@id/actionStartSpace"
         android:scaleType="center"
-        android:tint="?riotx_text_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toEndOf="@+id/actionStartSpace"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@drawable/ic_room_actions_notifications_all" />
+        tools:src="@drawable/ic_room_actions_notifications_all"
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/actionTitle"
@@ -61,12 +62,13 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_check_white_24dp"
-        android:tint="@color/riotx_accent"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
+        tools:visibility="visible"
+        app:tint="@color/riotx_accent"
+        tools:ignore="MissingPrefix" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
index bed1d5eb2f..74781468b2 100644
--- a/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
+++ b/vector/src/main/res/layout/item_bottom_sheet_room_preview.xml
@@ -64,9 +64,10 @@
         android:contentDescription="@string/room_list_quick_actions_settings"
         android:scaleType="centerInside"
         android:src="@drawable/ic_room_actions_settings"
-        android:tint="?riotx_text_secondary"
         app:layout_constraintBottom_toBottomOf="@+id/bottomSheetRoomPreviewAvatar"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/bottomSheetRoomPreviewAvatar" />
+        app:layout_constraintTop_toTopOf="@id/bottomSheetRoomPreviewAvatar"
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_create_direct_room_user.xml b/vector/src/main/res/layout/item_create_direct_room_user.xml
index fa7e742584..108c02cd02 100644
--- a/vector/src/main/res/layout/item_create_direct_room_user.xml
+++ b/vector/src/main/res/layout/item_create_direct_room_user.xml
@@ -32,8 +32,9 @@
             android:layout_height="40dp"
             android:scaleType="centerInside"
             android:src="@drawable/ic_material_done"
-            android:tint="@android:color/white"
-            android:visibility="visible" />
+            android:visibility="visible"
+            app:tint="@android:color/white"
+            tools:ignore="MissingPrefix" />
     </FrameLayout>
 
     <TextView
diff --git a/vector/src/main/res/layout/item_group.xml b/vector/src/main/res/layout/item_group.xml
index c42d1e26e9..d99c990cc7 100644
--- a/vector/src/main/res/layout/item_group.xml
+++ b/vector/src/main/res/layout/item_group.xml
@@ -45,10 +45,11 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="21dp"
         android:src="@drawable/ic_arrow_right"
-        android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toTopOf="@+id/groupBottomSeparator"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
     <View
         android:id="@+id/groupBottomSeparator"
diff --git a/vector/src/main/res/layout/item_help_footer.xml b/vector/src/main/res/layout/item_help_footer.xml
index 7a1db62872..9ea25d99c8 100644
--- a/vector/src/main/res/layout/item_help_footer.xml
+++ b/vector/src/main/res/layout/item_help_footer.xml
@@ -12,12 +12,13 @@
         android:layout_width="32dp"
         android:layout_height="32dp"
         android:src="@drawable/ic_idea"
-        android:tint="?attr/riotx_text_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/itemHelpText"
         app:layout_constraintHorizontal_chainStyle="packed"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?attr/riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/itemHelpText"
diff --git a/vector/src/main/res/layout/item_known_user.xml b/vector/src/main/res/layout/item_known_user.xml
index 7a77a2667e..c539aaba2e 100644
--- a/vector/src/main/res/layout/item_known_user.xml
+++ b/vector/src/main/res/layout/item_known_user.xml
@@ -32,8 +32,9 @@
             android:layout_height="40dp"
             android:scaleType="centerInside"
             android:src="@drawable/ic_material_done"
-            android:tint="@android:color/white"
-            android:visibility="visible" />
+            android:visibility="visible"
+            app:tint="@android:color/white"
+            tools:ignore="MissingPrefix" />
     </FrameLayout>
 
     <TextView
diff --git a/vector/src/main/res/layout/item_login_password_form.xml b/vector/src/main/res/layout/item_login_password_form.xml
index 19b0c5452b..75ae10bc36 100644
--- a/vector/src/main/res/layout/item_login_password_form.xml
+++ b/vector/src/main/res/layout/item_login_password_form.xml
@@ -43,8 +43,9 @@
             android:background="?attr/selectableItemBackground"
             android:scaleType="center"
             android:src="@drawable/ic_eye"
-            android:tint="?attr/colorAccent"
-            tools:contentDescription="@string/a11y_show_password" />
+            tools:contentDescription="@string/a11y_show_password"
+            app:tint="?attr/colorAccent"
+            tools:ignore="MissingPrefix" />
 
     </FrameLayout>
 
diff --git a/vector/src/main/res/layout/item_policy.xml b/vector/src/main/res/layout/item_policy.xml
index b5a14b27db..fbf5e39987 100644
--- a/vector/src/main/res/layout/item_policy.xml
+++ b/vector/src/main/res/layout/item_policy.xml
@@ -54,9 +54,10 @@
         android:paddingEnd="0dp"
         android:rotationY="@integer/rtl_mirror_flip"
         android:src="@drawable/ic_material_chevron_right_black"
-        android:tint="?riotx_android_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_android_secondary"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_profile_action.xml b/vector/src/main/res/layout/item_profile_action.xml
index 6d3ba36d06..c928a5f59b 100644
--- a/vector/src/main/res/layout/item_profile_action.xml
+++ b/vector/src/main/res/layout/item_profile_action.xml
@@ -84,11 +84,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_arrow_right"
-        android:tint="?riotx_text_secondary"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
+        tools:visibility="visible"
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_profile_matrix_item.xml b/vector/src/main/res/layout/item_profile_matrix_item.xml
index 1c84a65691..f35141576c 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item.xml
@@ -80,10 +80,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_arrow_right"
-        android:tint="?riotx_text_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
index 66cff4840e..69e4b40bb4 100644
--- a/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
+++ b/vector/src/main/res/layout/item_profile_matrix_item_progress.xml
@@ -92,11 +92,12 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/ic_arrow_right"
-        android:tint="?riotx_text_secondary"
         android:visibility="visible"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
+        tools:visibility="visible"
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_room.xml b/vector/src/main/res/layout/item_room.xml
index 814ef645d7..cdbcaf5757 100644
--- a/vector/src/main/res/layout/item_room.xml
+++ b/vector/src/main/res/layout/item_room.xml
@@ -42,8 +42,9 @@
             android:layout_height="56dp"
             android:scaleType="centerInside"
             android:src="@drawable/ic_material_done"
-            android:tint="@android:color/white"
-            android:visibility="visible" />
+            android:visibility="visible"
+            app:tint="@android:color/white"
+            tools:ignore="MissingPrefix" />
 
     </FrameLayout>
 
@@ -105,12 +106,13 @@
         android:layout_marginEnd="4dp"
         android:src="@drawable/ic_edit"
         android:visibility="gone"
-        android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toBottomOf="@+id/roomNameView"
         app:layout_constraintEnd_toStartOf="@+id/roomUnreadCounterBadgeView"
         app:layout_constraintStart_toEndOf="@+id/roomNameView"
         app:layout_constraintTop_toTopOf="@+id/roomNameView"
-        tools:visibility="visible" />
+        tools:visibility="visible"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
     <im.vector.app.features.home.room.list.UnreadCounterBadgeView
         android:id="@+id/roomUnreadCounterBadgeView"
diff --git a/vector/src/main/res/layout/item_settings_three_pid.xml b/vector/src/main/res/layout/item_settings_three_pid.xml
index fd3443ac17..a175788d86 100644
--- a/vector/src/main/res/layout/item_settings_three_pid.xml
+++ b/vector/src/main/res/layout/item_settings_three_pid.xml
@@ -13,11 +13,12 @@
         android:layout_width="16dp"
         android:layout_height="16dp"
         android:scaleType="center"
-        android:tint="?riotx_text_secondary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@drawable/ic_phone" />
+        tools:src="@drawable/ic_phone"
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/item_settings_three_pid_title"
@@ -39,9 +40,10 @@
         android:layout_height="@dimen/layout_touch_size"
         android:scaleType="center"
         android:src="@drawable/ic_trash_24"
-        android:tint="@color/riotx_destructive_accent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="@color/riotx_destructive_accent"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_signout_action.xml b/vector/src/main/res/layout/item_signout_action.xml
index 16d10a3ff0..10292beb55 100644
--- a/vector/src/main/res/layout/item_signout_action.xml
+++ b/vector/src/main/res/layout/item_signout_action.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/signedOutActionClickable"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -20,7 +22,8 @@
         android:layout_marginEnd="16dp"
         android:scaleType="fitCenter"
         android:src="@drawable/ic_secure_backup"
-        android:tint="?riotx_text_primary" />
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/actionTitleText"
diff --git a/vector/src/main/res/layout/item_timeline_event_poll_result_item.xml b/vector/src/main/res/layout/item_timeline_event_poll_result_item.xml
index a7b16fee54..eafd97d4e0 100644
--- a/vector/src/main/res/layout/item_timeline_event_poll_result_item.xml
+++ b/vector/src/main/res/layout/item_timeline_event_poll_result_item.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="40dp"
@@ -15,7 +16,8 @@
         android:paddingStart="2dp"
         android:paddingEnd="2dp"
         android:src="@drawable/ic_check_white_24dp"
-        android:tint="?riotx_text_secondary" />
+        app:tint="?riotx_text_secondary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/pollResultItemLabel"
diff --git a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
index ffaddd8739..598b7d2dc1 100644
--- a/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_poll_stub.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -16,7 +17,8 @@
             android:layout_gravity="center"
             android:layout_margin="4dp"
             android:src="@drawable/ic_poll"
-            android:tint="@color/riotx_accent" />
+            app:tint="@color/riotx_accent"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/pollLabelText"
diff --git a/vector/src/main/res/layout/item_tos.xml b/vector/src/main/res/layout/item_tos.xml
index c38a71d23a..b3387991b2 100644
--- a/vector/src/main/res/layout/item_tos.xml
+++ b/vector/src/main/res/layout/item_tos.xml
@@ -46,9 +46,10 @@
         android:layout_height="wrap_content"
         android:rotationY="@integer/rtl_mirror_flip"
         android:src="@drawable/ic_material_chevron_right_black"
-        android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_uploads_file.xml b/vector/src/main/res/layout/item_uploads_file.xml
index 58edcc78a4..5c40327d95 100644
--- a/vector/src/main/res/layout/item_uploads_file.xml
+++ b/vector/src/main/res/layout/item_uploads_file.xml
@@ -13,10 +13,11 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:src="@drawable/ic_file"
-        android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/uploadsFileTitle"
@@ -55,10 +56,11 @@
         android:layout_height="@dimen/layout_touch_size"
         android:scaleType="center"
         android:src="@drawable/ic_download"
-        android:tint="?colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/uploadsFileActionShare"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?colorAccent"
+        tools:ignore="MissingPrefix" />
 
     <ImageView
         android:id="@+id/uploadsFileActionShare"
@@ -67,9 +69,10 @@
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
         android:scaleType="center"
         android:src="@drawable/ic_material_share"
-        android:tint="?colorAccent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?colorAccent"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_verification_action.xml b/vector/src/main/res/layout/item_verification_action.xml
index 263a8ff107..ae49893792 100644
--- a/vector/src/main/res/layout/item_verification_action.xml
+++ b/vector/src/main/res/layout/item_verification_action.xml
@@ -20,13 +20,14 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:scaleType="center"
-        android:tint="?riotx_text_primary"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         tools:src="@drawable/ic_share"
-        tools:visibility="visible" />
+        tools:visibility="visible"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
 
     <TextView
@@ -66,10 +67,11 @@
         android:layout_width="48dp"
         android:layout_height="48dp"
         android:scaleType="center"
-        android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:src="@drawable/ic_arrow_right" />
+        tools:src="@drawable/ic_arrow_right"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/vector/src/main/res/layout/item_verification_wait.xml b/vector/src/main/res/layout/item_verification_wait.xml
index 6cfc497b16..675af87cbf 100644
--- a/vector/src/main/res/layout/item_verification_wait.xml
+++ b/vector/src/main/res/layout/item_verification_wait.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/itemVerificationNoticeText"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -28,10 +29,11 @@
         android:layout_marginTop="16dp"
         android:scaleType="fitCenter"
         android:src="@drawable/ic_monitor"
-        android:tint="?vctr_notice_secondary"
         app:layout_constraintEnd_toStartOf="@id/smartphoneIcon"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/use_latest_riot" />
+        app:layout_constraintTop_toBottomOf="@+id/use_latest_riot"
+        app:tint="?vctr_notice_secondary"
+        tools:ignore="MissingPrefix" />
 
     <ImageView
         android:id="@+id/smartphoneIcon"
@@ -40,10 +42,11 @@
         android:layout_marginTop="16dp"
         android:scaleType="fitCenter"
         android:src="@drawable/ic_smartphone"
-        android:tint="?vctr_notice_secondary"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/monitorIcon"
-        app:layout_constraintTop_toBottomOf="@+id/use_latest_riot" />
+        app:layout_constraintTop_toBottomOf="@+id/use_latest_riot"
+        app:tint="?vctr_notice_secondary"
+        tools:ignore="MissingPrefix" />
 
 
     <TextView
diff --git a/vector/src/main/res/layout/merge_composer_layout.xml b/vector/src/main/res/layout/merge_composer_layout.xml
index 94a69ed1fa..908b3f009b 100644
--- a/vector/src/main/res/layout/merge_composer_layout.xml
+++ b/vector/src/main/res/layout/merge_composer_layout.xml
@@ -70,8 +70,8 @@
         android:id="@+id/composer_related_message_action_image"
         android:layout_width="0dp"
         android:layout_height="0dp"
-        android:tint="?riotx_text_primary"
-        tools:ignore="MissingConstraints" />
+        tools:ignore="MissingConstraints,MissingPrefix"
+        app:tint="?riotx_text_primary" />
 
     <ImageButton
         android:id="@+id/composer_related_message_close"
diff --git a/vector/src/main/res/layout/merge_image_attachment_overlay.xml b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
index b0e769579c..a4bb79fd31 100644
--- a/vector/src/main/res/layout/merge_image_attachment_overlay.xml
+++ b/vector/src/main/res/layout/merge_image_attachment_overlay.xml
@@ -28,11 +28,12 @@
         android:focusable="true"
         android:padding="6dp"
         android:scaleType="centerInside"
-        android:tint="@color/white"
         app:layout_constraintBottom_toBottomOf="@id/overlayTopBackground"
         app:layout_constraintStart_toStartOf="@id/overlayTopBackground"
         app:layout_constraintTop_toTopOf="@id/overlayTopBackground"
-        app:srcCompat="@drawable/ic_back_24dp" />
+        app:srcCompat="@drawable/ic_back_24dp"
+        app:tint="@color/white"
+        tools:ignore="MissingPrefix" />
 
     <TextView
         android:id="@+id/overlayCounterText"
@@ -77,11 +78,12 @@
         android:contentDescription="@string/share"
         android:focusable="true"
         android:padding="6dp"
-        android:tint="@color/white"
         app:layout_constraintBottom_toBottomOf="@id/overlayTopBackground"
         app:layout_constraintEnd_toEndOf="@id/overlayTopBackground"
         app:layout_constraintTop_toTopOf="@id/overlayTopBackground"
-        app:srcCompat="@drawable/ic_share" />
+        app:srcCompat="@drawable/ic_share"
+        app:tint="@color/white"
+        tools:ignore="MissingPrefix" />
 
 
     <androidx.constraintlayout.widget.Group
@@ -111,11 +113,12 @@
         android:focusable="true"
         android:padding="6dp"
         android:scaleType="centerInside"
-        android:tint="@color/white"
         app:layout_constraintBottom_toBottomOf="@id/overlayBottomBackground"
         app:layout_constraintStart_toStartOf="@id/overlayBottomBackground"
         app:layout_constraintTop_toTopOf="@id/overlayBottomBackground"
-        app:srcCompat="@drawable/ic_play_arrow" />
+        app:srcCompat="@drawable/ic_play_arrow"
+        app:tint="@color/white"
+        tools:ignore="MissingPrefix" />
 
     <SeekBar
         android:id="@+id/overlaySeekBar"
diff --git a/vector/src/main/res/layout/view_call_controls.xml b/vector/src/main/res/layout/view_call_controls.xml
index 94757c2c72..dd04581d84 100644
--- a/vector/src/main/res/layout/view_call_controls.xml
+++ b/vector/src/main/res/layout/view_call_controls.xml
@@ -23,8 +23,8 @@
             android:focusable="true"
             android:padding="16dp"
             android:src="@drawable/ic_call"
-            android:tint="@color/white"
-            tools:ignore="MissingConstraints" />
+            tools:ignore="MissingConstraints,MissingPrefix"
+            app:tint="@color/white" />
 
         <ImageView
             android:id="@+id/iv_icr_end_call"
@@ -36,8 +36,8 @@
             android:focusable="true"
             android:padding="16dp"
             android:src="@drawable/ic_call_end"
-            android:tint="@color/white"
-            tools:ignore="MissingConstraints" />
+            tools:ignore="MissingConstraints,MissingPrefix"
+            app:tint="@color/white" />
 
         <androidx.constraintlayout.helper.widget.Flow
             android:layout_width="match_parent"
@@ -68,9 +68,9 @@
             android:focusable="true"
             android:padding="10dp"
             android:src="@drawable/ic_home_bottom_chat"
-            android:tint="?attr/riotx_text_primary"
             app:backgroundTint="?attr/riotx_background"
-            tools:ignore="MissingConstraints" />
+            tools:ignore="MissingConstraints,MissingPrefix"
+            app:tint="?attr/riotx_text_primary" />
 
         <ImageView
             android:id="@+id/iv_mute_toggle"
@@ -81,11 +81,11 @@
             android:focusable="true"
             android:padding="16dp"
             android:src="@drawable/ic_microphone_off"
-            android:tint="?attr/riotx_text_primary"
             app:backgroundTint="?attr/riotx_background"
             tools:contentDescription="@string/a11y_mute_microphone"
-            tools:ignore="MissingConstraints"
-            tools:src="@drawable/ic_microphone_on" />
+            tools:ignore="MissingConstraints,MissingPrefix"
+            tools:src="@drawable/ic_microphone_on"
+            app:tint="?attr/riotx_text_primary" />
 
         <ImageView
             android:id="@+id/iv_end_call"
@@ -97,8 +97,8 @@
             android:focusable="true"
             android:padding="16dp"
             android:src="@drawable/ic_call_end"
-            android:tint="@color/white"
-            tools:ignore="MissingConstraints" />
+            tools:ignore="MissingConstraints,MissingPrefix"
+            app:tint="@color/white" />
 
         <ImageView
             android:id="@+id/iv_video_toggle"
@@ -109,10 +109,10 @@
             android:focusable="true"
             android:padding="16dp"
             android:src="@drawable/ic_call_videocam_off_default"
-            android:tint="?attr/riotx_text_primary"
             app:backgroundTint="?attr/riotx_background"
             tools:contentDescription="@string/a11y_stop_camera"
-            tools:ignore="MissingConstraints" />
+            tools:ignore="MissingConstraints,MissingPrefix"
+            app:tint="?attr/riotx_text_primary" />
 
         <ImageView
             android:id="@+id/iv_more"
@@ -124,9 +124,9 @@
             android:focusable="true"
             android:padding="8dp"
             android:src="@drawable/ic_more_vertical"
-            android:tint="?attr/riotx_text_primary"
             app:backgroundTint="?attr/riotx_background"
-            tools:ignore="MissingConstraints" />
+            tools:ignore="MissingConstraints,MissingPrefix"
+            app:tint="?attr/riotx_text_primary" />
 
         <androidx.constraintlayout.helper.widget.Flow
             android:layout_width="match_parent"
diff --git a/vector/src/main/res/layout/view_file_icon.xml b/vector/src/main/res/layout/view_file_icon.xml
index 7648608f25..dab678b5c1 100644
--- a/vector/src/main/res/layout/view_file_icon.xml
+++ b/vector/src/main/res/layout/view_file_icon.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:parentTag="android.widget.RelativeLayout"
     android:layout_width="50dp"
@@ -18,7 +19,8 @@
         android:layout_height="20dp"
         android:layout_centerInParent="true"
         android:src="@drawable/ic_download"
-        android:tint="?vctr_notice_secondary"
-        tools:src="@drawable/ic_paperclip" />
+        tools:src="@drawable/ic_paperclip"
+        app:tint="?vctr_notice_secondary"
+        tools:ignore="MissingPrefix" />
 
 </merge>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/view_keys_backup_banner.xml b/vector/src/main/res/layout/view_keys_backup_banner.xml
index 7e54823fae..7cd3f3d954 100644
--- a/vector/src/main/res/layout/view_keys_backup_banner.xml
+++ b/vector/src/main/res/layout/view_keys_backup_banner.xml
@@ -14,10 +14,11 @@
         android:layout_height="32dp"
         android:layout_marginStart="19dp"
         android:src="@drawable/ic_secure_backup"
-        android:tint="?riotx_text_primary"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?riotx_text_primary"
+        tools:ignore="MissingPrefix" />
 
     <Space
         android:id="@+id/view_keys_backup_banner_space1"
diff --git a/vector/src/main/res/layout/view_state.xml b/vector/src/main/res/layout/view_state.xml
index 082a0bb24c..2d11daadbc 100644
--- a/vector/src/main/res/layout/view_state.xml
+++ b/vector/src/main/res/layout/view_state.xml
@@ -73,12 +73,13 @@
             android:layout_width="64dp"
             android:layout_height="64dp"
             android:layout_gravity="center_horizontal"
-            android:tint="?riotx_text_primary"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            tools:src="@drawable/ic_noun_party_popper" />
+            tools:src="@drawable/ic_noun_party_popper"
+            app:tint="?riotx_text_primary"
+            tools:ignore="MissingPrefix" />
 
         <TextView
             android:id="@+id/emptyMessageView"