diff --git a/vector/src/main/res/layout/fragment_create_direct_room.xml b/vector/src/main/res/layout/fragment_create_direct_room.xml
index 66a040b935..f8450d1e6e 100644
--- a/vector/src/main/res/layout/fragment_create_direct_room.xml
+++ b/vector/src/main/res/layout/fragment_create_direct_room.xml
@@ -107,7 +107,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/addByMatrixId"
-            style="@style/VectorButtonStyleFlat"
+            style="@style/VectorButtonStyleText"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
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 4908d03f85..3cf845d108 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
@@ -79,7 +79,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/keys_backup_setup_step1_manualExport"
-        style="@style/VectorButtonStyleFlat"
+        style="@style/VectorButtonStyleText"
         android:layout_margin="16dp"
         android:layout_marginStart="@dimen/layout_horizontal_margin"
         android:layout_marginEnd="@dimen/layout_horizontal_margin"
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 57f3f488c6..fb290ce6ea 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
@@ -143,7 +143,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/keys_backup_setup_step2_skip_button"
-            style="@style/VectorButtonStyleFlat"
+            style="@style/VectorButtonStyleText"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="@dimen/layout_vertical_margin"
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 dc47208cd8..f0ca293076 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
@@ -78,7 +78,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/keys_backup_setup_step3_copy_button"
-            style="@style/VectorButtonStyleFlat"
+            style="@style/VectorButtonStyleText"
             android:layout_gravity="center"
             android:maxWidth="@dimen/button_max_width"
             android:text="@string/keys_backup_setup_step3_copy_button_title" />
diff --git a/vector/src/main/res/layout/fragment_login.xml b/vector/src/main/res/layout/fragment_login.xml
index 4c92a94b88..7e6e24a48c 100644
--- a/vector/src/main/res/layout/fragment_login.xml
+++ b/vector/src/main/res/layout/fragment_login.xml
@@ -120,7 +120,7 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/forgetPasswordButton"
-                    style="@style/Style.Vector.Login.Button.Wired"
+                    style="@style/Style.Vector.Login.Button.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="start"
diff --git a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
index 74f9c5e475..ded08221c9 100644
--- a/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
+++ b/vector/src/main/res/layout/fragment_login_signup_signin_selection.xml
@@ -68,7 +68,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/loginSignupSigninSignIn"
-                style="@style/Style.Vector.Login.Button.Wired"
+                style="@style/Style.Vector.Login.Button.Outlined"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="14dp"
diff --git a/vector/src/main/res/layout/fragment_public_rooms.xml b/vector/src/main/res/layout/fragment_public_rooms.xml
index ceb45b275b..acc9bb5673 100644
--- a/vector/src/main/res/layout/fragment_public_rooms.xml
+++ b/vector/src/main/res/layout/fragment_public_rooms.xml
@@ -45,7 +45,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/publicRoomsCreateNewRoom"
-            style="@style/VectorButtonStyleFlat"
+            style="@style/VectorButtonStyleText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
diff --git a/vector/src/main/res/layout/fragment_sas_verification_display_code.xml b/vector/src/main/res/layout/fragment_sas_verification_display_code.xml
index 197e92c5e6..2d3a3135cb 100644
--- a/vector/src/main/res/layout/fragment_sas_verification_display_code.xml
+++ b/vector/src/main/res/layout/fragment_sas_verification_display_code.xml
@@ -121,7 +121,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/sas_request_cancel_button"
-            style="@style/VectorButtonStyleFlat"
+            style="@style/VectorButtonStyleText"
             android:layout_margin="@dimen/layout_vertical_margin"
             android:text="@string/cancel"
             app:layout_constraintEnd_toStartOf="@+id/sas_request_continue_button"
diff --git a/vector/src/main/res/layout/fragment_sas_verification_incoming_request.xml b/vector/src/main/res/layout/fragment_sas_verification_incoming_request.xml
index 610c1687a4..67815d3e65 100644
--- a/vector/src/main/res/layout/fragment_sas_verification_incoming_request.xml
+++ b/vector/src/main/res/layout/fragment_sas_verification_incoming_request.xml
@@ -119,7 +119,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/sas_request_cancel_button"
-            style="@style/VectorButtonStyleFlat"
+            style="@style/VectorButtonStyleText"
             android:layout_gravity="end"
             android:layout_marginEnd="@dimen/layout_vertical_margin"
             android:layout_marginRight="@dimen/layout_vertical_margin"
diff --git a/vector/src/main/res/layout/fragment_sas_verification_start.xml b/vector/src/main/res/layout/fragment_sas_verification_start.xml
index 04f4cb8ee0..edc7e8f7e3 100644
--- a/vector/src/main/res/layout/fragment_sas_verification_start.xml
+++ b/vector/src/main/res/layout/fragment_sas_verification_start.xml
@@ -36,7 +36,7 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/sas_cancel_button"
-                style="@style/VectorButtonStyleFlat"
+                style="@style/VectorButtonStyleText"
                 android:layout_marginEnd="8dp"
                 android:layout_marginRight="8dp"
                 android:text="@string/cancel" />
@@ -68,7 +68,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/sas_legacy_verification"
-            style="@style/VectorButtonStyleFlat"
+            style="@style/VectorButtonStyleText"
             android:layout_gravity="end"
             android:layout_margin="@dimen/layout_horizontal_margin"
             android:text="@string/sas_legacy_verification_button_title"
diff --git a/vector/src/main/res/layout/item_room_filter_footer.xml b/vector/src/main/res/layout/item_room_filter_footer.xml
index 75a77d074d..00cede6f1f 100644
--- a/vector/src/main/res/layout/item_room_filter_footer.xml
+++ b/vector/src/main/res/layout/item_room_filter_footer.xml
@@ -16,7 +16,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/roomFilterFooterCreateRoom"
-        style="@style/VectorButtonStyleFlat"
+        style="@style/VectorButtonStyleText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -25,7 +25,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/roomFilterFooterCreateDirect"
-        style="@style/VectorButtonStyleFlat"
+        style="@style/VectorButtonStyleText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -33,7 +33,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/roomFilterFooterOpenRoomDirectory"
-        style="@style/VectorButtonStyleFlat"
+        style="@style/VectorButtonStyleText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/layout/vector_invite_view.xml b/vector/src/main/res/layout/vector_invite_view.xml
index 4f881f2532..5e557895c2 100644
--- a/vector/src/main/res/layout/vector_invite_view.xml
+++ b/vector/src/main/res/layout/vector_invite_view.xml
@@ -59,7 +59,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/inviteRejectView"
-        style="@style/VectorButtonStyleFlat"
+        style="@style/VectorButtonStyleText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
diff --git a/vector/src/main/res/layout/view_button_state.xml b/vector/src/main/res/layout/view_button_state.xml
index e79a3e7826..ce67f77c27 100644
--- a/vector/src/main/res/layout/view_button_state.xml
+++ b/vector/src/main/res/layout/view_button_state.xml
@@ -7,7 +7,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/buttonStateButtonFlat"
-        style="@style/VectorButtonStyleFlat"
+        style="@style/VectorButtonStyleText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -44,7 +44,7 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/buttonStateRetry"
-        style="@style/VectorButtonStyleFlat"
+        style="@style/VectorButtonStyleText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
diff --git a/vector/src/main/res/values/styles_login.xml b/vector/src/main/res/values/styles_login.xml
index 1fe53de595..9e74e8abec 100644
--- a/vector/src/main/res/values/styles_login.xml
+++ b/vector/src/main/res/values/styles_login.xml
@@ -19,7 +19,12 @@
         <item name="android:textAllCaps">false</item>
     </style>
 
-    <style name="Style.Vector.Login.Button.Wired" parent="VectorButtonStyleFlat">
+    <style name="Style.Vector.Login.Button.Outlined" parent="VectorButtonStyleOutlined">
+        <item name="android:minHeight">52dp</item>
+        <item name="android:textAllCaps">false</item>
+    </style>
+
+    <style name="Style.Vector.Login.Button.Text" parent="VectorButtonStyleText">
         <item name="android:minHeight">52dp</item>
         <item name="android:textAllCaps">false</item>
     </style>
diff --git a/vector/src/main/res/values/styles_riot.xml b/vector/src/main/res/values/styles_riot.xml
index c5b04de730..07091dedc0 100644
--- a/vector/src/main/res/values/styles_riot.xml
+++ b/vector/src/main/res/values/styles_riot.xml
@@ -136,7 +136,7 @@
 
     <!--Widget.AppCompat.Button.Borderless.Colored, which sets the text color to colorAccent,
         using colorControlHighlight as an overlay for focused and pressed states.-->
-    <style name="VectorButtonStyleFlat" parent="Widget.MaterialComponents.Button.TextButton">
+    <style name="VectorButtonStyleText" parent="Widget.MaterialComponents.Button.TextButton">
         <item name="android:textStyle">bold</item>
         <item name="android:textAllCaps">false</item>
         <item name="android:layout_width">wrap_content</item>
@@ -154,6 +154,8 @@
         <item name="android:background">@null</item>
         <!--item name="android:textColor">?colorAccent</item-->
         <item name="colorControlHighlight">?colorAccent</item>
+        <item name="strokeColor">?colorAccent</item>
+        <item name="strokeWidth">1dp</item>
     </style>
 
     <style name="AlerterButton" parent="Widget.AppCompat.Button.Borderless.Colored">