diff --git a/res/css/structures/_RoomDirectory.scss b/res/css/structures/_RoomDirectory.scss
index bcb52684d3..1589974741 100644
--- a/res/css/structures/_RoomDirectory.scss
+++ b/res/css/structures/_RoomDirectory.scss
@@ -180,10 +180,6 @@ limitations under the License.
 .mx_RoomDirectory > span {
     font-size: $font-15px;
     margin-top: 0;
-
-    .mx_AccessibleButton {
-        padding: 0;
-    }
 }
 
 @media screen and (max-width: 700px) {
@@ -191,10 +187,6 @@ limitations under the License.
         padding: 0px;
     }
 
-    .mx_AccessibleButton_kind_secondary {
-        padding: 0px !important;
-    }
-
     .mx_RoomDirectory_join {
         margin-left: 0px;
     }
diff --git a/res/css/structures/auth/_SetupEncryptionBody.scss b/res/css/structures/auth/_SetupEncryptionBody.scss
index 52651ec2a9..9acd23501f 100644
--- a/res/css/structures/auth/_SetupEncryptionBody.scss
+++ b/res/css/structures/auth/_SetupEncryptionBody.scss
@@ -20,7 +20,6 @@ limitations under the License.
 
     .mx_SetupEncryptionBody_reset_link {
         &.mx_AccessibleButton_kind_link_inline {
-            padding: 0;
             color: $alert;
         }
     }
diff --git a/res/css/views/dialogs/_InviteDialog.scss b/res/css/views/dialogs/_InviteDialog.scss
index 6fd3d0510f..ee7f47f8fd 100644
--- a/res/css/views/dialogs/_InviteDialog.scss
+++ b/res/css/views/dialogs/_InviteDialog.scss
@@ -256,10 +256,6 @@ limitations under the License.
 
 .mx_InviteDialog_helpText {
     margin: 0;
-
-    .mx_AccessibleButton_kind_link {
-        padding: 0;
-    }
 }
 
 .mx_InviteDialog_dialPad {
diff --git a/res/css/views/dialogs/_RoomSettingsDialogBridges.scss b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
index 07735ad027..a847419a94 100644
--- a/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
+++ b/res/css/views/dialogs/_RoomSettingsDialogBridges.scss
@@ -17,12 +17,6 @@ limitations under the License.
 .mx_RoomSettingsDialog_BridgeList {
     padding: 0;
 
-    .mx_AccessibleButton {
-        display: inline;
-        margin: 0;
-        padding: 0;
-    }
-
     li {
         list-style-type: none;
 
diff --git a/res/css/views/dialogs/_ServerOfflineDialog.scss b/res/css/views/dialogs/_ServerOfflineDialog.scss
index 7a1b0bbcab..a4f7fad1be 100644
--- a/res/css/views/dialogs/_ServerOfflineDialog.scss
+++ b/res/css/views/dialogs/_ServerOfflineDialog.scss
@@ -63,7 +63,6 @@ limitations under the License.
 
                     .mx_AccessibleButton {
                         float: right;
-                        padding: 0;
                     }
                 }
             }
diff --git a/res/css/views/dialogs/_SpotlightDialog.scss b/res/css/views/dialogs/_SpotlightDialog.scss
index 586b9540b7..93e4289ad5 100644
--- a/res/css/views/dialogs/_SpotlightDialog.scss
+++ b/res/css/views/dialogs/_SpotlightDialog.scss
@@ -416,7 +416,6 @@ limitations under the License.
         }
 
         .mx_SpotlightDialog_recentSearches > h4 > .mx_AccessibleButton_kind_link {
-            padding: 0;
             float: right;
             font-size: $font-12px;
             line-height: $font-15px;
@@ -468,10 +467,6 @@ limitations under the License.
 
         > span {
             align-self: center;
-
-            .mx_AccessibleButton_kind_link_inline {
-                padding: 0;
-            }
         }
 
         .mx_AccessibleButton_kind_primary_outline {
diff --git a/res/css/views/elements/_AccessibleButton.scss b/res/css/views/elements/_AccessibleButton.scss
index a6fb0a7e22..5f6afbb043 100644
--- a/res/css/views/elements/_AccessibleButton.scss
+++ b/res/css/views/elements/_AccessibleButton.scss
@@ -137,15 +137,11 @@ limitations under the License.
         font-size: inherit;
         font-weight: normal;
         line-height: inherit;
-    }
-
-    &.mx_AccessibleButton_kind_link {
         padding: 0;
     }
 
     &.mx_AccessibleButton_kind_link_inline {
         display: inline;
-        padding: 0 2px;
     }
 
     &.mx_AccessibleButton_kind_confirm_sm,
diff --git a/res/css/views/elements/_ReplyChain.scss b/res/css/views/elements/_ReplyChain.scss
index 5071fc7005..b2d1a4d0f9 100644
--- a/res/css/views/elements/_ReplyChain.scss
+++ b/res/css/views/elements/_ReplyChain.scss
@@ -22,7 +22,6 @@ limitations under the License.
 
     .mx_ReplyChain_show {
         &.mx_AccessibleButton_kind_link_inline {
-            padding: 0;
             color: unset;
             white-space: nowrap; // Enforce 'In reply to' to be a single line
 
diff --git a/res/css/views/elements/_ServerPicker.scss b/res/css/views/elements/_ServerPicker.scss
index 8ef45e6ca8..ce9f031c50 100644
--- a/res/css/views/elements/_ServerPicker.scss
+++ b/res/css/views/elements/_ServerPicker.scss
@@ -69,8 +69,6 @@ limitations under the License.
     }
 
     .mx_ServerPicker_change {
-        padding: 0;
-        font-size: inherit;
         grid-column: 2;
         grid-row: 2;
     }
diff --git a/res/css/views/messages/_ViewSourceEvent.scss b/res/css/views/messages/_ViewSourceEvent.scss
index c0803eafd0..2febda3eba 100644
--- a/res/css/views/messages/_ViewSourceEvent.scss
+++ b/res/css/views/messages/_ViewSourceEvent.scss
@@ -36,7 +36,6 @@ limitations under the License.
         visibility: hidden;
         // override styles from AccessibleButton
         border-radius: 0;
-        padding: 0;
         // icon
         mask-repeat: no-repeat;
         mask-position: 0 center;
diff --git a/res/css/views/rooms/_EventTile.scss b/res/css/views/rooms/_EventTile.scss
index ea502798c6..4e294ed9a3 100644
--- a/res/css/views/rooms/_EventTile.scss
+++ b/res/css/views/rooms/_EventTile.scss
@@ -647,10 +647,6 @@ $threadInfoLineHeight: calc(2 * $font-12px); // See: _commons.scss
         .mx_AccessibleButton {
             color: $primary-content;
             text-decoration: underline;
-
-            &.mx_AccessibleButton_kind_link_inline {
-                padding: 0;
-            }
         }
     }
 }
diff --git a/res/css/views/rooms/_RoomPreviewCard.scss b/res/css/views/rooms/_RoomPreviewCard.scss
index 3ee37e585d..2c01eca642 100644
--- a/res/css/views/rooms/_RoomPreviewCard.scss
+++ b/res/css/views/rooms/_RoomPreviewCard.scss
@@ -33,13 +33,6 @@ limitations under the License.
         position: relative;
         padding-left: calc(20px + $spacing-8);
 
-        .mx_AccessibleButton_kind_link {
-            display: inline;
-            padding: 0;
-            font-size: inherit;
-            line-height: inherit;
-        }
-
         &::before {
             content: "";
             position: absolute;
diff --git a/res/css/views/settings/_JoinRuleSettings.scss b/res/css/views/settings/_JoinRuleSettings.scss
index 30d6b6b678..c4a9343c3c 100644
--- a/res/css/views/settings/_JoinRuleSettings.scss
+++ b/res/css/views/settings/_JoinRuleSettings.scss
@@ -81,8 +81,3 @@ limitations under the License.
         }
     }
 }
-
-.mx_JoinRuleSettings_linkButton {
-    padding: 0;
-    font-size: inherit;
-}
diff --git a/res/css/views/settings/_UpdateCheckButton.scss b/res/css/views/settings/_UpdateCheckButton.scss
index f35a023ac1..14f5d8d3ef 100644
--- a/res/css/views/settings/_UpdateCheckButton.scss
+++ b/res/css/views/settings/_UpdateCheckButton.scss
@@ -16,8 +16,4 @@ limitations under the License.
 
 .mx_UpdateCheckButton_summary {
     margin-left: 16px;
-
-    .mx_AccessibleButton_kind_link {
-        padding: 0;
-    }
 }
diff --git a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
index 2f64cde271..ddcf7c11ac 100644
--- a/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
+++ b/res/css/views/settings/tabs/user/_SecurityUserSettingsTab.scss
@@ -32,7 +32,6 @@ limitations under the License.
     }
     .mx_SettingsTab_section {
         .mx_AccessibleButton_kind_link {
-            padding: 0;
             font-size: inherit;
         }
     }
diff --git a/res/css/views/toasts/_NonUrgentEchoFailureToast.scss b/res/css/views/toasts/_NonUrgentEchoFailureToast.scss
index 9a8229b38e..7080cd5adc 100644
--- a/res/css/views/toasts/_NonUrgentEchoFailureToast.scss
+++ b/res/css/views/toasts/_NonUrgentEchoFailureToast.scss
@@ -30,8 +30,4 @@ limitations under the License.
     span { // includes the i18n block
         vertical-align: middle;
     }
-
-    .mx_AccessibleButton {
-        padding: 0;
-    }
 }
diff --git a/res/css/views/voip/_CallView.scss b/res/css/views/voip/_CallView.scss
index d3de2fa740..8ef78fa548 100644
--- a/res/css/views/voip/_CallView.scss
+++ b/res/css/views/voip/_CallView.scss
@@ -127,10 +127,6 @@ limitations under the License.
                     width: 30px;
                     height: 30px;
                 }
-
-                .mx_AccessibleButton_hasKind {
-                    padding: 0px;
-                }
             }
         }
     }
diff --git a/src/async-components/views/dialogs/security/CreateKeyBackupDialog.tsx b/src/async-components/views/dialogs/security/CreateKeyBackupDialog.tsx
index 707e3cbaf7..9866a21241 100644
--- a/src/async-components/views/dialogs/security/CreateKeyBackupDialog.tsx
+++ b/src/async-components/views/dialogs/security/CreateKeyBackupDialog.tsx
@@ -305,11 +305,9 @@ export default class CreateKeyBackupDialog extends React.PureComponent<IProps, I
         if (matchText) {
             passPhraseMatch = <div className="mx_CreateKeyBackupDialog_passPhraseMatch">
                 <div>{ matchText }</div>
-                <div>
-                    <AccessibleButton element="span" className="mx_linkButton" onClick={this.onSetAgainClick}>
-                        { changeText }
-                    </AccessibleButton>
-                </div>
+                <AccessibleButton kind="link" onClick={this.onSetAgainClick}>
+                    { changeText }
+                </AccessibleButton>
             </div>;
         }
         return <form onSubmit={this.onPassPhraseConfirmNextClick}>
diff --git a/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx b/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx
index 769c41419b..27c970430a 100644
--- a/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx
+++ b/src/async-components/views/dialogs/security/CreateSecretStorageDialog.tsx
@@ -656,11 +656,9 @@ export default class CreateSecretStorageDialog extends React.PureComponent<IProp
         if (matchText) {
             passPhraseMatch = <div>
                 <div>{ matchText }</div>
-                <div>
-                    <AccessibleButton element="span" className="mx_linkButton" onClick={this.onSetAgainClick}>
-                        { changeText }
-                    </AccessibleButton>
-                </div>
+                <AccessibleButton kind="link" onClick={this.onSetAgainClick}>
+                    { changeText }
+                </AccessibleButton>
             </div>;
         }
         return <form onSubmit={this.onPassPhraseConfirmNextClick}>
diff --git a/src/components/structures/UserMenu.tsx b/src/components/structures/UserMenu.tsx
index 6da5f86bda..fdb380c94d 100644
--- a/src/components/structures/UserMenu.tsx
+++ b/src/components/structures/UserMenu.tsx
@@ -276,14 +276,14 @@ export default class UserMenu extends React.Component<IProps, IState> {
                 <div className="mx_UserMenu_contextMenu_header mx_UserMenu_contextMenu_guestPrompts">
                     { _t("Got an account? <a>Sign in</a>", {}, {
                         a: sub => (
-                            <AccessibleButton kind="link" onClick={this.onSignInClick}>
+                            <AccessibleButton kind="link_inline" onClick={this.onSignInClick}>
                                 { sub }
                             </AccessibleButton>
                         ),
                     }) }
                     { _t("New here? <a>Create an account</a>", {}, {
                         a: sub => (
-                            <AccessibleButton kind="link" onClick={this.onRegisterClick}>
+                            <AccessibleButton kind="link_inline" onClick={this.onRegisterClick}>
                                 { sub }
                             </AccessibleButton>
                         ),
diff --git a/src/components/structures/auth/ForgotPassword.tsx b/src/components/structures/auth/ForgotPassword.tsx
index 5c58903ff7..b1f8154792 100644
--- a/src/components/structures/auth/ForgotPassword.tsx
+++ b/src/components/structures/auth/ForgotPassword.tsx
@@ -368,7 +368,7 @@ export default class ForgotPassword extends React.Component<IProps, IState> {
                     value={_t('Send Reset Email')}
                 />
             </form>
-            <AccessibleButton kind='link_inline' className="mx_AuthBody_changeFlow" onClick={this.onLoginClick}>
+            <AccessibleButton kind='link' className="mx_AuthBody_changeFlow" onClick={this.onLoginClick}>
                 { _t('Sign in instead') }
             </AccessibleButton>
         </div>;
diff --git a/src/components/structures/auth/Registration.tsx b/src/components/structures/auth/Registration.tsx
index d349205ab9..92d72c8ac5 100644
--- a/src/components/structures/auth/Registration.tsx
+++ b/src/components/structures/auth/Registration.tsx
@@ -580,7 +580,7 @@ export default class Registration extends React.Component<IProps, IState> {
         let goBack;
         if (this.state.doingUIAuth) {
             goBack = <AccessibleButton
-                kind='link_inline'
+                kind='link'
                 className="mx_AuthBody_changeFlow"
                 onClick={this.onGoToFormClicked}
             >
@@ -601,8 +601,7 @@ export default class Registration extends React.Component<IProps, IState> {
                         },
                     ) }</p>
                     <p><AccessibleButton
-                        element="span"
-                        className="mx_linkButton"
+                        kind="link_inline"
                         onClick={async event => {
                             const sessionLoaded = await this.onLoginClickWithCheck(event);
                             if (sessionLoaded) {
@@ -620,8 +619,7 @@ export default class Registration extends React.Component<IProps, IState> {
                     "<a>Log in</a> to your new account.", {},
                     {
                         a: (sub) => <AccessibleButton
-                            element="span"
-                            className="mx_linkButton"
+                            kind="link_inline"
                             onClick={async event => {
                                 const sessionLoaded = await this.onLoginClickWithCheck(event);
                                 if (sessionLoaded) {
diff --git a/src/components/views/auth/InteractiveAuthEntryComponents.tsx b/src/components/views/auth/InteractiveAuthEntryComponents.tsx
index 97c45999bd..b33e3d3747 100644
--- a/src/components/views/auth/InteractiveAuthEntryComponents.tsx
+++ b/src/components/views/auth/InteractiveAuthEntryComponents.tsx
@@ -865,7 +865,7 @@ export class FallbackAuthEntry extends React.Component<IAuthEntryProps> {
         }
         return (
             <div>
-                <AccessibleButton kind='link_inline' inputRef={this.fallbackButton} onClick={this.onShowFallbackClick}>{
+                <AccessibleButton kind='link' inputRef={this.fallbackButton} onClick={this.onShowFallbackClick}>{
                     _t("Start authentication")
                 }</AccessibleButton>
                 { errorSection }
diff --git a/src/components/views/dialogs/BetaFeedbackDialog.tsx b/src/components/views/dialogs/BetaFeedbackDialog.tsx
index bc6a05a0be..193149bc3a 100644
--- a/src/components/views/dialogs/BetaFeedbackDialog.tsx
+++ b/src/components/views/dialogs/BetaFeedbackDialog.tsx
@@ -44,7 +44,7 @@ const BetaFeedbackDialog: React.FC<IProps> = ({ featureId, onFinished }) => {
         }))}
     >
         <AccessibleButton
-            kind="link"
+            kind="link_inline"
             onClick={() => {
                 onFinished(false);
                 defaultDispatcher.dispatch({
diff --git a/src/components/views/dialogs/FeedbackDialog.tsx b/src/components/views/dialogs/FeedbackDialog.tsx
index 373db59208..b46d10fa94 100644
--- a/src/components/views/dialogs/FeedbackDialog.tsx
+++ b/src/components/views/dialogs/FeedbackDialog.tsx
@@ -102,7 +102,7 @@ const FeedbackDialog: React.FC<IProps> = (props: IProps) => {
                 _t("PRO TIP: If you start a bug, please submit <debugLogsLink>debug logs</debugLogsLink> " +
                     "to help us track down the problem.", {}, {
                     debugLogsLink: sub => (
-                        <AccessibleButton kind="link" onClick={onDebugLogsLinkClick}>{ sub }</AccessibleButton>
+                        <AccessibleButton kind="link_inline" onClick={onDebugLogsLinkClick}>{ sub }</AccessibleButton>
                     ),
                 })
             }</p>
diff --git a/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx b/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
index 950768e11e..244eab54b7 100644
--- a/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
+++ b/src/components/views/dialogs/security/AccessSecretStorageDialog.tsx
@@ -328,8 +328,8 @@ export default class AccessSecretStorageDialog extends React.PureComponent<IProp
                 <p>{ _t(
                     "Enter your Security Phrase or <button>use your Security Key</button> to continue.", {},
                     {
-                        button: s => <AccessibleButton className="mx_linkButton"
-                            element="span"
+                        button: s => <AccessibleButton
+                            kind="link_inline"
                             onClick={this.onUseRecoveryKeyClick}
                         >
                             { s }
diff --git a/src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx b/src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx
index 0fedcf3d93..5f8d7cd425 100644
--- a/src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx
+++ b/src/components/views/dialogs/security/RestoreKeyBackupDialog.tsx
@@ -408,15 +408,13 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps,
                     {},
                     {
                         button1: s => <AccessibleButton
-                            className="mx_linkButton"
-                            element="span"
+                            kind="link_inline"
                             onClick={this.onUseRecoveryKeyClick}
                         >
                             { s }
                         </AccessibleButton>,
                         button2: s => <AccessibleButton
-                            className="mx_linkButton"
-                            element="span"
+                            kind="link_inline"
                             onClick={this.onResetRecoveryClick}
                         >
                             { s }
@@ -470,8 +468,8 @@ export default class RestoreKeyBackupDialog extends React.PureComponent<IProps,
                     "<button>set up new recovery options</button>",
                     {},
                     {
-                        button: s => <AccessibleButton className="mx_linkButton"
-                            element="span"
+                        button: s => <AccessibleButton
+                            kind="link_inline"
                             onClick={this.onResetRecoveryClick}
                         >
                             { s }
diff --git a/src/components/views/messages/TileErrorBoundary.tsx b/src/components/views/messages/TileErrorBoundary.tsx
index 3c453f1ee8..361dae2a6b 100644
--- a/src/components/views/messages/TileErrorBoundary.tsx
+++ b/src/components/views/messages/TileErrorBoundary.tsx
@@ -76,14 +76,14 @@ export default class TileErrorBoundary extends React.Component<IProps, IState> {
 
             let submitLogsButton;
             if (SdkConfig.get().bug_report_endpoint_url) {
-                submitLogsButton = <AccessibleButton kind="link_inline" onClick={this.onBugReport}>
+                submitLogsButton = <AccessibleButton kind="link" onClick={this.onBugReport}>
                     { _t("Submit logs") }
                 </AccessibleButton>;
             }
 
             let viewSourceButton;
             if (mxEvent && SettingsStore.getValue("developerMode")) {
-                viewSourceButton = <AccessibleButton onClick={this.onViewSource} kind="link_inline">
+                viewSourceButton = <AccessibleButton onClick={this.onViewSource} kind="link">
                     { _t("View Source") }
                 </AccessibleButton>;
             }
diff --git a/src/components/views/messages/ViewSourceEvent.tsx b/src/components/views/messages/ViewSourceEvent.tsx
index b4cca0b5cc..00a143e9ce 100644
--- a/src/components/views/messages/ViewSourceEvent.tsx
+++ b/src/components/views/messages/ViewSourceEvent.tsx
@@ -76,7 +76,7 @@ export default class ViewSourceEvent extends React.PureComponent<IProps, IState>
         return <span className={classes}>
             { content }
             <AccessibleButton
-                kind='link_inline'
+                kind='link'
                 title={_t('toggle event')}
                 className="mx_ViewSourceEvent_toggle"
                 onClick={this.onToggle}
diff --git a/src/components/views/rooms/NewRoomIntro.tsx b/src/components/views/rooms/NewRoomIntro.tsx
index 9c9f190210..40d3d4ce0c 100644
--- a/src/components/views/rooms/NewRoomIntro.tsx
+++ b/src/components/views/rooms/NewRoomIntro.tsx
@@ -99,17 +99,13 @@ const NewRoomIntro = () => {
         let topicText;
         if (canAddTopic && topic) {
             topicText = _t("Topic: %(topic)s (<a>edit</a>)", { topic }, {
-                a: sub => <AccessibleButton kind="link" onClick={onTopicClick}>{ sub }</AccessibleButton>,
+                a: sub => <AccessibleButton kind="link_inline" onClick={onTopicClick}>{ sub }</AccessibleButton>,
             });
         } else if (topic) {
             topicText = _t("Topic: %(topic)s ", { topic });
         } else if (canAddTopic) {
             topicText = _t("<a>Add a topic</a> to help people know what it is about.", {}, {
-                a: sub => <AccessibleButton
-                    kind="link"
-                    element="span"
-                    onClick={onTopicClick}
-                >{ sub }</AccessibleButton>,
+                a: sub => <AccessibleButton kind="link_inline" onClick={onTopicClick}>{ sub }</AccessibleButton>,
             });
         }
 
diff --git a/src/components/views/settings/JoinRuleSettings.tsx b/src/components/views/settings/JoinRuleSettings.tsx
index 08c63e69c7..c7423d1b24 100644
--- a/src/components/views/settings/JoinRuleSettings.tsx
+++ b/src/components/views/settings/JoinRuleSettings.tsx
@@ -163,8 +163,7 @@ const JoinRuleSettings = ({ room, promptUpgrade, aliasWarning, onError, beforeCh
                         a: sub => <AccessibleButton
                             disabled={disabled}
                             onClick={onEditRestrictedClick}
-                            kind="link"
-                            className="mx_JoinRuleSettings_linkButton"
+                            kind="link_inline"
                         >
                             { sub }
                         </AccessibleButton>,
diff --git a/src/components/views/settings/UpdateCheckButton.tsx b/src/components/views/settings/UpdateCheckButton.tsx
index 9d88e079a7..a2aeacd7ad 100644
--- a/src/components/views/settings/UpdateCheckButton.tsx
+++ b/src/components/views/settings/UpdateCheckButton.tsx
@@ -42,7 +42,7 @@ function getStatusText(status: UpdateCheckStatus, errorDetail?: string) {
             return _t('Downloading update...');
         case UpdateCheckStatus.Ready:
             return _t("New version available. <a>Update now.</a>", {}, {
-                a: sub => <AccessibleButton kind="link" onClick={installUpdate}>{ sub }</AccessibleButton>,
+                a: sub => <AccessibleButton kind="link_inline" onClick={installUpdate}>{ sub }</AccessibleButton>,
             });
     }
 }
diff --git a/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx b/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
index 3467660ff7..125b60e0bd 100644
--- a/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
+++ b/src/components/views/settings/tabs/room/NotificationSettingsTab.tsx
@@ -196,7 +196,10 @@ export default class NotificationsSettingsTab extends React.Component<IProps, IS
                                     { _t("Default") }
                                     <div className="mx_NotificationSettingsTab_microCopy">
                                         { _t("Get notifications as set up in your <a>settings</a>", {}, {
-                                            a: sub => <AccessibleButton kind="link" onClick={this.onOpenSettingsClick}>
+                                            a: sub => <AccessibleButton
+                                                kind="link_inline"
+                                                onClick={this.onOpenSettingsClick}
+                                            >
                                                 { sub }
                                             </AccessibleButton>,
                                         }) }
@@ -219,7 +222,10 @@ export default class NotificationsSettingsTab extends React.Component<IProps, IS
                                     <div className="mx_NotificationSettingsTab_microCopy">
                                         { _t("Get notified only with mentions and keywords " +
                                             "as set up in your <a>settings</a>", {}, {
-                                            a: sub => <AccessibleButton kind="link" onClick={this.onOpenSettingsClick}>
+                                            a: sub => <AccessibleButton
+                                                kind="link_inline"
+                                                onClick={this.onOpenSettingsClick}
+                                            >
                                                 { sub }
                                             </AccessibleButton>,
                                         }) }
diff --git a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
index 2b67d22c0d..e72be3404b 100644
--- a/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
+++ b/src/components/views/settings/tabs/user/PreferencesUserSettingsTab.tsx
@@ -162,7 +162,7 @@ export default class PreferencesUserSettingsTab extends React.Component<IProps,
                     <span className="mx_SettingsTab_subheading">{ _t("Keyboard shortcuts") }</span>
                     <div className="mx_SettingsFlag">
                         { _t("To view all keyboard shortcuts, <a>click here</a>.", {}, {
-                            a: sub => <AccessibleButton kind="link" onClick={this.onKeyboardShortcutsClicked}>
+                            a: sub => <AccessibleButton kind="link_inline" onClick={this.onKeyboardShortcutsClicked}>
                                 { sub }
                             </AccessibleButton>,
                         }) }
diff --git a/src/components/views/spaces/SpaceCreateMenu.tsx b/src/components/views/spaces/SpaceCreateMenu.tsx
index 5b93d5e001..8e5bfb2cd7 100644
--- a/src/components/views/spaces/SpaceCreateMenu.tsx
+++ b/src/components/views/spaces/SpaceCreateMenu.tsx
@@ -105,7 +105,7 @@ export const SpaceFeedbackPrompt = ({ onClick }: { onClick?: () => void }) => {
     return <div className="mx_SpaceFeedbackPrompt">
         <span className="mx_SpaceFeedbackPrompt_text">{ _t("Spaces are a new feature.") }</span>
         <AccessibleButton
-            kind="link"
+            kind="link_inline"
             onClick={() => {
                 if (onClick) onClick();
                 Modal.createDialog(GenericFeatureFeedbackDialog, {
diff --git a/src/components/views/toasts/NonUrgentEchoFailureToast.tsx b/src/components/views/toasts/NonUrgentEchoFailureToast.tsx
index 96aeac9449..cd169718e7 100644
--- a/src/components/views/toasts/NonUrgentEchoFailureToast.tsx
+++ b/src/components/views/toasts/NonUrgentEchoFailureToast.tsx
@@ -32,7 +32,7 @@ export default class NonUrgentEchoFailureToast extends React.PureComponent {
                 <span className="mx_NonUrgentEchoFailureToast_icon" />
                 { _t("Your server isn't responding to some <a>requests</a>.", {}, {
                     'a': (sub) => (
-                        <AccessibleButton kind="link" onClick={this.openDialog}>{ sub }</AccessibleButton>
+                        <AccessibleButton kind="link_inline" onClick={this.openDialog}>{ sub }</AccessibleButton>
                     ),
                 }) }
             </div>
diff --git a/src/components/views/voip/CallView.tsx b/src/components/views/voip/CallView.tsx
index b212a2d5ba..53c3ec59e6 100644
--- a/src/components/views/voip/CallView.tsx
+++ b/src/components/views/voip/CallView.tsx
@@ -484,7 +484,7 @@ export default class CallView extends React.Component<IProps, IState> {
                             transferee: transfereeName,
                         },
                         {
-                            a: sub => <AccessibleButton kind="link" onClick={this.onTransferClick}>
+                            a: sub => <AccessibleButton kind="link_inline" onClick={this.onTransferClick}>
                                 { sub }
                             </AccessibleButton>,
                         },
@@ -499,7 +499,7 @@ export default class CallView extends React.Component<IProps, IState> {
                             : _td("You held the call <a>Resume</a>"),
                         {},
                         {
-                            a: sub => <AccessibleButton kind="link" onClick={this.onCallResumeClick}>
+                            a: sub => <AccessibleButton kind="link_inline" onClick={this.onCallResumeClick}>
                                 { sub }
                             </AccessibleButton>,
                         },
diff --git a/src/toasts/AnalyticsToast.tsx b/src/toasts/AnalyticsToast.tsx
index d056456bd9..c7f2bdb59a 100644
--- a/src/toasts/AnalyticsToast.tsx
+++ b/src/toasts/AnalyticsToast.tsx
@@ -109,7 +109,7 @@ export const showToast = (): void => {
         // The user had no analytics setting previously set, so we just need to prompt to opt-in, rather than
         // explaining any change.
         const learnMoreLink = (sub: string) => (
-            <AccessibleButton kind="link" onClick={onLearnMoreNoOptIn}>{ sub }</AccessibleButton>
+            <AccessibleButton kind="link_inline" onClick={onLearnMoreNoOptIn}>{ sub }</AccessibleButton>
         );
         props = {
             description: _t(