diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index 9b950b20..13142c22 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -25,13 +25,17 @@
         <item name="android:fontFamily">"sans-serif"</item>
     </style>
 
-    <!-- Alert Dialog: Button color are not colorAccent by default TODO extend Dark for dark theme -->
-    <style name="VectorAlertDialogStyle" parent="Theme.MaterialComponents.Light.Dialog.Alert">
+    <!-- Alert Dialog: Button color are not colorAccent by default -->
+    <style name="VectorAlertDialogStyleLight" parent="Theme.MaterialComponents.Light.Dialog.Alert">
+        <item name="buttonBarButtonStyle">@style/VectorAlertDialogButtonStyle</item>
+    </style>
+
+    <style name="VectorAlertDialogStyleDark" parent="Theme.MaterialComponents.Dialog.Alert">
         <item name="buttonBarButtonStyle">@style/VectorAlertDialogButtonStyle</item>
     </style>
 
     <style name="VectorAlertDialogButtonStyle" parent="Widget.MaterialComponents.Button.TextButton">
-        <item name="android:textColor">?colorAccent</item>
+        <item name="android:textColor">@color/riotx_accent</item>
     </style>
 
 
diff --git a/vector/src/main/res/values/theme_black.xml b/vector/src/main/res/values/theme_black.xml
index 67fe9b94..83b27bb4 100644
--- a/vector/src/main/res/values/theme_black.xml
+++ b/vector/src/main/res/values/theme_black.xml
@@ -51,7 +51,7 @@
 
         <item name="materialButtonStyle">@style/VectorButtonStyle</item>
         <item name="toolbarStyle">@style/VectorToolbarStyle</item>
-        <item name="alertDialogTheme">@style/VectorAlertDialogStyle</item>
+        <item name="alertDialogTheme">@style/VectorAlertDialogStyleDark</item>
 
         <item name="android:textColorLink">@color/riotx_links</item>
 
diff --git a/vector/src/main/res/values/theme_dark.xml b/vector/src/main/res/values/theme_dark.xml
index 4cbf3f32..f6050599 100644
--- a/vector/src/main/res/values/theme_dark.xml
+++ b/vector/src/main/res/values/theme_dark.xml
@@ -49,7 +49,7 @@
 
         <item name="materialButtonStyle">@style/VectorButtonStyle</item>
         <item name="toolbarStyle">@style/VectorToolbarStyle</item>
-        <item name="alertDialogTheme">@style/VectorAlertDialogStyle</item>
+        <item name="alertDialogTheme">@style/VectorAlertDialogStyleDark</item>
 
         <item name="android:textColorLink">@color/riotx_links</item>
 
diff --git a/vector/src/main/res/values/theme_light.xml b/vector/src/main/res/values/theme_light.xml
index 4880da20..03d1c4ef 100644
--- a/vector/src/main/res/values/theme_light.xml
+++ b/vector/src/main/res/values/theme_light.xml
@@ -49,7 +49,7 @@
 
         <item name="materialButtonStyle">@style/VectorButtonStyle</item>
         <item name="toolbarStyle">@style/VectorToolbarStyle</item>
-        <item name="alertDialogTheme">@style/VectorAlertDialogStyle</item>
+        <item name="alertDialogTheme">@style/VectorAlertDialogStyleLight</item>
 
         <item name="android:textColorLink">@color/riotx_links</item>