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 4d1d398559..15d02e0321 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
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:tint="@color/riotx_accent"
+        app:tint="?colorAccent"
         tools:ignore="MissingPrefix" />
 
     <TextView
diff --git a/vector/src/main/res/layout/fragment_home_drawer.xml b/vector/src/main/res/layout/fragment_home_drawer.xml
index 13a332b5bb..042c848f8b 100644
--- a/vector/src/main/res/layout/fragment_home_drawer.xml
+++ b/vector/src/main/res/layout/fragment_home_drawer.xml
@@ -89,7 +89,7 @@
             app:iconGravity="textStart"
             app:iconPadding="0dp"
             app:iconSize="20dp"
-            app:iconTint="@color/riotx_accent"
+            app:iconTint="?colorAccent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="@id/homeDrawerUsernameView" />
 
diff --git a/vector/src/main/res/layout/fragment_qr_code_scanner.xml b/vector/src/main/res/layout/fragment_qr_code_scanner.xml
index 135a856f4a..620b811b4b 100644
--- a/vector/src/main/res/layout/fragment_qr_code_scanner.xml
+++ b/vector/src/main/res/layout/fragment_qr_code_scanner.xml
@@ -35,7 +35,7 @@
 <!--        app:iconGravity="textStart"-->
 <!--        app:iconPadding="0dp"-->
 <!--        app:iconSize="20dp"-->
-<!--        app:iconTint="@color/riotx_accent"-->
+<!--        app:iconTint="?colorAccent"-->
 <!--        app:layout_constraintBottom_toBottomOf="parent"-->
 <!--        app:layout_constraintEnd_toEndOf="parent"/>-->
 
diff --git a/vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml b/vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
index f35c1c91e2..4280e5df83 100644
--- a/vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
+++ b/vector/src/main/res/layout/fragment_qr_code_scanner_with_button.xml
@@ -43,7 +43,7 @@
         app:iconGravity="textStart"
         app:iconPadding="0dp"
         app:iconSize="20dp"
-        app:iconTint="@color/riotx_accent"
+        app:iconTint="?colorAccent"
         app:layout_constraintBottom_toBottomOf="@id/userCodeMyCodeButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintEnd_toStartOf="@id/userCodeMyCodeButton"
diff --git a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
index 728b90b696..1134c61fc8 100644
--- a/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
+++ b/vector/src/main/res/layout/item_timeline_event_merged_room_creation_stub.xml
@@ -94,7 +94,7 @@
             android:layout_height="wrap_content"
             android:layout_marginEnd="16dp"
             android:textColor="?riotx_text_secondary"
-            android:textColorLink="@color/riotx_accent"
+            android:textColorLink="?colorAccent"
             android:textSize="15sp"
             android:textStyle="normal"
             app:layout_constraintEnd_toEndOf="parent"
@@ -121,7 +121,7 @@
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:background="@drawable/circle"
-                android:backgroundTint="@color/riotx_accent"
+                android:backgroundTint="?colorAccent"
                 android:importantForAccessibility="no"
                 android:scaleType="center"
                 android:src="@drawable/ic_add_people" />
@@ -132,7 +132,7 @@
                 android:layout_marginTop="4dp"
                 android:importantForAccessibility="no"
                 android:text="@string/add_people"
-                android:textColor="@color/riotx_accent" />
+                android:textColor="?colorAccent" />
 
         </LinearLayout>