diff --git a/vector/src/main/res/layout/alerter_incoming_call_layout.xml b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
index 05296dd65a..023ac6e3d3 100644
--- a/vector/src/main/res/layout/alerter_incoming_call_layout.xml
+++ b/vector/src/main/res/layout/alerter_incoming_call_layout.xml
@@ -59,7 +59,7 @@
         android:layout_height="40dp"
         android:layout_marginEnd="12dp"
         android:background="@drawable/bg_rounded_button"
-        android:backgroundTint="@color/riotx_accent"
+        android:backgroundTint="?colorAccent"
         android:clickable="true"
         android:contentDescription="@string/call_notification_answer"
         android:focusable="true"
diff --git a/vector/src/main/res/layout/view_attachment_type_selector.xml b/vector/src/main/res/layout/view_attachment_type_selector.xml
index ee1534b0d4..f4823f6775 100644
--- a/vector/src/main/res/layout/view_attachment_type_selector.xml
+++ b/vector/src/main/res/layout/view_attachment_type_selector.xml
@@ -34,7 +34,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"
@@ -56,7 +56,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"
@@ -78,7 +78,7 @@
                     style="@style/AttachmentTypeSelectorButton"
                     android:contentDescription="@string/attachment_type_file"
                     android:src="@drawable/ic_attachment_file_white_24dp"
-                    tools:background="@color/riotx_accent" />
+                    tools:background="?colorAccent" />
 
                 <TextView
                     style="@style/AttachmentTypeSelectorLabel"
@@ -109,7 +109,7 @@
                     style="@style/AttachmentTypeSelectorButton"
                     android:contentDescription="@string/attachment_type_audio"
                     android:src="@drawable/ic_attachment_audio_white_24dp"
-                    tools:background="@color/riotx_accent" />
+                    tools:background="?colorAccent" />
 
                 <TextView
                     style="@style/AttachmentTypeSelectorLabel"
@@ -131,7 +131,7 @@
                     style="@style/AttachmentTypeSelectorButton"
                     android:contentDescription="@string/attachment_type_contact"
                     android:src="@drawable/ic_attachment_contact_white_24dp"
-                    tools:background="@color/riotx_accent" />
+                    tools:background="?colorAccent" />
 
                 <TextView
                     style="@style/AttachmentTypeSelectorLabel"
@@ -153,7 +153,7 @@
                     style="@style/AttachmentTypeSelectorButton"
                     android:contentDescription="@string/attachment_type_sticker"
                     android:src="@drawable/ic_attachment_stickers_white_24dp"
-                    tools:background="@color/riotx_accent" />
+                    tools:background="?colorAccent" />
 
                 <TextView
                     style="@style/AttachmentTypeSelectorLabel"
diff --git a/vector/src/main/res/layout/view_call_controls.xml b/vector/src/main/res/layout/view_call_controls.xml
index e1d3d67776..20e0261670 100644
--- a/vector/src/main/res/layout/view_call_controls.xml
+++ b/vector/src/main/res/layout/view_call_controls.xml
@@ -19,7 +19,7 @@
             android:layout_width="56dp"
             android:layout_height="56dp"
             android:background="@drawable/bg_rounded_button"
-            android:backgroundTint="@color/riotx_accent"
+            android:backgroundTint="?colorAccent"
             android:clickable="true"
             android:contentDescription="@string/call_notification_answer"
             android:focusable="true"