diff --git a/vector/src/main/res/drawable/bg_breadcrumbs_typing.xml b/vector/src/main/res/drawable/bg_breadcrumbs_typing.xml
index 47a095c8ba..6b70bd1f87 100644
--- a/vector/src/main/res/drawable/bg_breadcrumbs_typing.xml
+++ b/vector/src/main/res/drawable/bg_breadcrumbs_typing.xml
@@ -4,5 +4,5 @@
 
     <corners android:radius="40dp" />
 
-    <solid android:color="@color/riotx_accent" />
-</shape>
\ No newline at end of file
+    <solid android:color="?colorAccent" />
+</shape>
diff --git a/vector/src/main/res/layout/fragment_known_users.xml b/vector/src/main/res/layout/fragment_known_users.xml
index 99bbc5dc62..d51b095f75 100644
--- a/vector/src/main/res/layout/fragment_known_users.xml
+++ b/vector/src/main/res/layout/fragment_known_users.xml
@@ -136,7 +136,7 @@
             android:visibility="visible"
             app:icon="@drawable/ic_plus_circle"
             app:iconPadding="13dp"
-            app:iconTint="@color/riotx_accent"
+            app:iconTint="?colorAccent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/addByMatrixId" />
 
diff --git a/vector/src/main/res/layout/view_avatar_selector.xml b/vector/src/main/res/layout/view_avatar_selector.xml
index c303347960..666a75fbb1 100644
--- a/vector/src/main/res/layout/view_avatar_selector.xml
+++ b/vector/src/main/res/layout/view_avatar_selector.xml
@@ -30,7 +30,7 @@
                 style="@style/AttachmentTypeSelectorButton"
                 android:contentDescription="@string/attachment_type_camera"
                 android:src="@drawable/ic_attachment_camera_white_24dp"
-                tools:background="@color/riotx_accent" />
+                tools:background="?colorAccent" />
 
             <TextView
                 style="@style/AttachmentTypeSelectorLabel"
@@ -52,7 +52,7 @@
                 style="@style/AttachmentTypeSelectorButton"
                 android:contentDescription="@string/attachment_type_gallery"
                 android:src="@drawable/ic_attachment_gallery_white_24dp"
-                tools:background="@color/riotx_accent" />
+                tools:background="?colorAccent" />
 
             <TextView
                 style="@style/AttachmentTypeSelectorLabel"
diff --git a/vector/src/main/res/menu/menu_submit.xml b/vector/src/main/res/menu/menu_submit.xml
index 5539cf4307..ab7e90a12e 100644
--- a/vector/src/main/res/menu/menu_submit.xml
+++ b/vector/src/main/res/menu/menu_submit.xml
@@ -6,7 +6,7 @@
         android:id="@+id/action_submit"
         android:icon="@drawable/ic_material_done"
         android:title="@string/ok"
-        app:iconTint="@color/riotx_accent"
+        app:iconTint="?colorAccent"
         app:showAsAction="always" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/vector/src/main/res/menu/menu_timeline.xml b/vector/src/main/res/menu/menu_timeline.xml
index d4eb923d50..faebf9a2aa 100644
--- a/vector/src/main/res/menu/menu_timeline.xml
+++ b/vector/src/main/res/menu/menu_timeline.xml
@@ -8,7 +8,7 @@
         android:icon="@drawable/ic_video"
         android:title="@string/action_video_call"
         android:visible="false"
-        app:iconTint="@color/riotx_accent"
+        app:iconTint="?colorAccent"
         app:showAsAction="always"
         tools:visible="true" />
 
@@ -22,7 +22,7 @@
         android:icon="@drawable/ic_phone"
         android:title="@string/call"
         android:visible="false"
-        app:iconTint="@color/riotx_accent"
+        app:iconTint="?colorAccent"
         app:showAsAction="always"
         tools:visible="true" />
 
@@ -58,4 +58,4 @@
         app:showAsAction="never"
         tools:visible="true" />
 
-</menu>
\ No newline at end of file
+</menu>
diff --git a/vector/src/main/res/xml/vector_settings_general.xml b/vector/src/main/res/xml/vector_settings_general.xml
index 1278dd933f..e7e632ac09 100644
--- a/vector/src/main/res/xml/vector_settings_general.xml
+++ b/vector/src/main/res/xml/vector_settings_general.xml
@@ -31,7 +31,7 @@
             android:key="ADD_EMAIL_PREFERENCE_KEY"
             android:order="100"
             android:title="@string/settings_add_email_address"
-            app:iconTint="@color/riotx_accent" />
+            app:iconTint="?colorAccent" />
 
         <!-- Phone will be added here -->
 
@@ -41,7 +41,7 @@
             android:key="ADD_PHONE_NUMBER_PREFERENCE_KEY"
             android:order="200"
             android:title="@string/settings_add_phone_number"
-            app:iconTint="@color/riotx_accent" />
+            app:iconTint="?colorAccent" />
 
         <im.vector.riotx.core.preference.VectorPreference
             android:order="1000"
@@ -134,4 +134,4 @@
 
     </im.vector.riotx.core.preference.VectorPreferenceCategory>
 
-</androidx.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.PreferenceScreen>