diff --git a/res/css/views/dialogs/_InviteDialog.pcss b/res/css/views/dialogs/_InviteDialog.pcss
index 93be8b355a..cc737c9611 100644
--- a/res/css/views/dialogs/_InviteDialog.pcss
+++ b/res/css/views/dialogs/_InviteDialog.pcss
@@ -28,9 +28,9 @@ Please see LICENSE files in the repository root for full details.
     }
 
     .mx_InviteDialog_goButton {
-        min-width: 48px;
+        min-width: 86px;
         margin-inline-start: 10px;
-        height: 25px;
+        height: 41px;
         line-height: $font-25px;
     }
 }
diff --git a/res/css/views/dialogs/_ServerPickerDialog.pcss b/res/css/views/dialogs/_ServerPickerDialog.pcss
index b1346ff73f..63ad6d1942 100644
--- a/res/css/views/dialogs/_ServerPickerDialog.pcss
+++ b/res/css/views/dialogs/_ServerPickerDialog.pcss
@@ -64,7 +64,7 @@ Please see LICENSE files in the repository root for full details.
     }
 
     .mx_AccessibleButton_kind_primary {
-        width: calc(100% - 64px);
+        width: calc(100% - 26px);
         margin: 0 8px;
         padding: 15px 18px;
     }
diff --git a/res/css/views/elements/_AccessibleButton.pcss b/res/css/views/elements/_AccessibleButton.pcss
index c67a7441be..d9d78912f0 100644
--- a/res/css/views/elements/_AccessibleButton.pcss
+++ b/res/css/views/elements/_AccessibleButton.pcss
@@ -37,6 +37,7 @@ Please see LICENSE files in the repository root for full details.
         font: var(--cpd-font-body-md-semibold);
         border: none; /* override default <button /> styles */
         word-break: keep-all; /* prevent button text in Chinese/Japanese/Korean (CJK) from being collapsed */
+        box-sizing: border-box;
 
         &.mx_AccessibleButton_kind_primary_sm,
         &.mx_AccessibleButton_kind_danger_sm,
@@ -47,11 +48,13 @@ Please see LICENSE files in the repository root for full details.
         &.mx_AccessibleButton_kind_primary_sm {
             color: var(--cpd-color-text-on-solid-primary);
             background-color: var(--cpd-color-bg-action-primary-rest);
+            border: 1px solid var(--cpd-color-bg-action-primary-rest);
         }
 
         &.mx_AccessibleButton_kind_danger_sm {
             color: var(--cpd-color-text-on-solid-primary);
             background-color: var(--cpd-color-bg-critical-primary);
+            border: 1px solid var(--cpd-color-bg-critical-primary);
         }
 
         &.mx_AccessibleButton_kind_link_sm {