diff --git a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
index df8bf11cc8..5369bf2dee 100644
--- a/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
+++ b/vector/src/main/java/im/vector/app/core/epoxy/bottomsheet/BottomSheetRoomPreviewItem.kt
@@ -85,7 +85,7 @@ abstract class BottomSheetRoomPreviewItem : VectorEpoxyModel<BottomSheetRoomPrev
         val tintColor: Int
         if (isLowPriority) {
             holder.roomLowPriority.contentDescription = stringProvider.getString(R.string.room_list_quick_actions_low_priority_remove)
-            tintColor = ContextCompat.getColor(holder.view.context, R.color.riotx_accent)
+            tintColor = ColorProvider(holder.view.context).getColor(R.color.riotx_accent)
         } else {
             holder.roomLowPriority.contentDescription = stringProvider.getString(R.string.room_list_quick_actions_low_priority_add)
             tintColor = ThemeUtils.getColor(holder.view.context, R.attr.riotx_text_secondary)
diff --git a/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt b/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
index d418822b7f..c0db617f4b 100644
--- a/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/views/BottomSheetActionButton.kt
@@ -24,7 +24,6 @@ import android.view.View
 import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.core.content.ContextCompat
 import androidx.core.content.withStyledAttributes
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
@@ -33,6 +32,7 @@ import butterknife.BindView
 import butterknife.ButterKnife
 import im.vector.app.R
 import im.vector.app.core.extensions.setTextOrHide
+import im.vector.app.core.resources.ColorProvider
 import im.vector.app.features.themes.ThemeUtils
 
 class BottomSheetActionButton @JvmOverloads constructor(
@@ -127,7 +127,7 @@ class BottomSheetActionButton @JvmOverloads constructor(
             rightIcon = getDrawable(R.styleable.BottomSheetActionButton_rightIcon)
 
             tint = getColor(R.styleable.BottomSheetActionButton_tint, ThemeUtils.getColor(context, android.R.attr.textColor))
-            titleTextColor = getColor(R.styleable.BottomSheetActionButton_titleTextColor, ContextCompat.getColor(context, R.color.riotx_accent))
+            titleTextColor = getColor(R.styleable.BottomSheetActionButton_titleTextColor, ColorProvider(context).getColor(R.color.riotx_accent))
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
index 6f9e0d0d1c..d972743c08 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt
@@ -638,7 +638,7 @@ class RoomDetailFragment @Inject constructor(
                 val actionView = matrixAppsMenuItem.actionView
                 actionView
                         .findViewById<ImageView>(R.id.action_view_icon_image)
-                        .setColorFilter(ContextCompat.getColor(requireContext(), R.color.riotx_accent))
+                        .setColorFilter(ColorProvider(requireContext()).getColor(R.color.riotx_accent))
                 actionView.findViewById<TextView>(R.id.cart_badge).setTextOrHide("$widgetsCount")
                 matrixAppsMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
             } else {
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 c9d0ac9c8c..f443abd1dd 100644
--- a/vector/src/main/res/layout/dialog_export_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_export_e2e_keys.xml
@@ -81,7 +81,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/exportDialogSubmit"
-        style="@style/VectorButtonStyle"
+        style="?materialButtonStyle"
         android:layout_width="wrap_content"
         android:layout_gravity="end"
         android:enabled="false"
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 dc0e50eaff..ddb575d713 100644
--- a/vector/src/main/res/layout/dialog_import_e2e_keys.xml
+++ b/vector/src/main/res/layout/dialog_import_e2e_keys.xml
@@ -60,7 +60,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/dialog_e2e_keys_import_button"
-        style="@style/VectorButtonStyle"
+        style="?materialButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end"
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 10f953bdf5..5afe4dea7e 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
@@ -89,7 +89,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/keys_restore_button"
-            style="@style/VectorButtonStyle"
+            style="?materialButtonStyle"
             android:layout_marginTop="@dimen/layout_vertical_margin_big"
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
             android:minWidth="200dp"
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 ffa1296494..b51252e5c8 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
@@ -89,7 +89,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/keys_backup_restore_with_passphrase_submit"
-            style="@style/VectorButtonStyle"
+            style="?materialButtonStyle"
             android:layout_marginTop="@dimen/layout_vertical_margin_big"
             android:layout_marginEnd="@dimen/layout_horizontal_margin"
             android:layout_marginBottom="@dimen/layout_vertical_margin_big"
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 f5ce626c8f..d5457a9dda 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
@@ -47,7 +47,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/keys_backup_setup_done_button"
-        style="@style/VectorButtonStyle"
+        style="?materialButtonStyle"
         android:layout_margin="20dp"
         android:minWidth="200dp"
         android:text="@string/done"
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 29d2137ddd..fd0067f4ed 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
@@ -50,7 +50,7 @@
     <!-- Centered button -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/keys_backup_setup_step1_button"
-        style="@style/VectorButtonStyle"
+        style="?materialButtonStyle"
         android:layout_width="wrap_content"
         android:layout_margin="16dp"
         android:maxWidth="@dimen/button_max_width"
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 6615b845df..d1de171ed8 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
@@ -116,7 +116,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/keys_backup_setup_step2_button"
-            style="@style/VectorButtonStyle"
+            style="?materialButtonStyle"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="16dp"
             android:text="@string/keys_backup_setup_step2_button_title"
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 2fa2f17a6a..adbd0c6f85 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
@@ -88,7 +88,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/keys_backup_setup_step3_button"
-            style="@style/VectorButtonStyle"
+            style="?materialButtonStyle"
             android:layout_gravity="center"
             android:layout_marginTop="@dimen/layout_vertical_margin"
             android:layout_marginBottom="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_review_terms.xml b/vector/src/main/res/layout/fragment_review_terms.xml
index d97628670c..325e68bd67 100644
--- a/vector/src/main/res/layout/fragment_review_terms.xml
+++ b/vector/src/main/res/layout/fragment_review_terms.xml
@@ -37,7 +37,7 @@
 
         <Button
             android:id="@+id/reviewTermsAccept"
-            style="@style/VectorButtonStyle"
+            style="?materialButtonStyle"
             android:layout_width="wrap_content"
             android:text="@string/accept" />
 
diff --git a/vector/src/main/res/layout/item_form_submit_button.xml b/vector/src/main/res/layout/item_form_submit_button.xml
index d39da4f893..d032383655 100644
--- a/vector/src/main/res/layout/item_form_submit_button.xml
+++ b/vector/src/main/res/layout/item_form_submit_button.xml
@@ -8,11 +8,11 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/form_submit_button"
-        style="@style/VectorButtonStyle"
+        style="?materialButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical|end"
         android:layout_marginEnd="@dimen/alerter_activity_vertical_margin"
         tools:text="@string/auth_submit" />
 
-</FrameLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/vector/src/main/res/layout/item_generic_list.xml b/vector/src/main/res/layout/item_generic_list.xml
index f89413f15f..106d200dd4 100644
--- a/vector/src/main/res/layout/item_generic_list.xml
+++ b/vector/src/main/res/layout/item_generic_list.xml
@@ -94,7 +94,7 @@
     <!-- Set a max width because the text can be long -->
     <com.google.android.material.button.MaterialButton
         android:id="@+id/item_generic_action_button"
-        style="@style/VectorButtonStyle"
+        style="?materialButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
diff --git a/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml b/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
index 105bbc1429..01c4f7b5a5 100644
--- a/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
+++ b/vector/src/main/res/layout/item_keys_backup_settings_button_footer.xml
@@ -10,7 +10,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/keys_backup_settings_footer_button1"
-        style="@style/VectorButtonStyle"
+        style="?materialButtonStyle"
         android:layout_width="@dimen/button_max_width"
         android:visibility="gone"
         tools:text="@string/keys_backup_settings_restore_backup_button"
@@ -18,7 +18,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/keys_backup_settings_footer_button2"
-        style="@style/VectorButtonStyle"
+        style="?materialButtonStyle"
         android:layout_width="@dimen/button_max_width"
         android:layout_marginTop="16dp"
         android:visibility="gone"
diff --git a/vector/src/main/res/layout/item_notification_troubleshoot.xml b/vector/src/main/res/layout/item_notification_troubleshoot.xml
index 507b936d20..8d96fddfc2 100644
--- a/vector/src/main/res/layout/item_notification_troubleshoot.xml
+++ b/vector/src/main/res/layout/item_notification_troubleshoot.xml
@@ -58,7 +58,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/troubleshootTestButton"
-        style="@style/VectorButtonStyle"
+        style="?materialButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"