diff --git a/app/assets/javascripts/components/AccountMenu/ConfirmPassword.tsx b/app/assets/javascripts/components/AccountMenu/ConfirmPassword.tsx
index 2aad0c0b1..cbb981c8c 100644
--- a/app/assets/javascripts/components/AccountMenu/ConfirmPassword.tsx
+++ b/app/assets/javascripts/components/AccountMenu/ConfirmPassword.tsx
@@ -130,7 +130,7 @@ export const ConfirmPassword: FunctionComponent<Props> = observer(
             label={
               isRegistering ? 'Creating account...' : 'Create account & sign in'
             }
-            type="primary"
+            variant="primary"
             onClick={handleConfirmFormSubmit}
             disabled={isRegistering}
           />
diff --git a/app/assets/javascripts/components/AccountMenu/CreateAccount.tsx b/app/assets/javascripts/components/AccountMenu/CreateAccount.tsx
index 002e28e51..fb6c8ffa7 100644
--- a/app/assets/javascripts/components/AccountMenu/CreateAccount.tsx
+++ b/app/assets/javascripts/components/AccountMenu/CreateAccount.tsx
@@ -122,7 +122,7 @@ export const CreateAccount: FunctionComponent<Props> = observer(
           <Button
             className="btn-w-full mt-1"
             label="Next"
-            type="primary"
+            variant="primary"
             onClick={handleRegisterFormSubmit}
           />
         </form>
diff --git a/app/assets/javascripts/components/AccountMenu/SignIn.tsx b/app/assets/javascripts/components/AccountMenu/SignIn.tsx
index 6e3365684..0d4deacaa 100644
--- a/app/assets/javascripts/components/AccountMenu/SignIn.tsx
+++ b/app/assets/javascripts/components/AccountMenu/SignIn.tsx
@@ -171,7 +171,7 @@ export const SignInPane: FunctionComponent<Props> = observer(
           <Button
             className="btn-w-full mt-1 mb-3"
             label={isSigningIn ? 'Signing in...' : 'Sign in'}
-            type="primary"
+            variant="primary"
             onClick={handleSignInFormSubmit}
             disabled={isSigningIn}
           />
diff --git a/app/assets/javascripts/components/AttachedFilesPopover/AttachedFilesPopover.tsx b/app/assets/javascripts/components/AttachedFilesPopover/AttachedFilesPopover.tsx
index 203509dc5..82c1f2c14 100644
--- a/app/assets/javascripts/components/AttachedFilesPopover/AttachedFilesPopover.tsx
+++ b/app/assets/javascripts/components/AttachedFilesPopover/AttachedFilesPopover.tsx
@@ -196,7 +196,7 @@ export const AttachedFilesPopover: FunctionComponent<Props> = observer(
                   : 'No files found in this account'}
               </div>
               <Button
-                type="normal"
+                variant="normal"
                 onClick={handleAttachFilesClick}
                 onBlur={closeOnBlur}
               >
diff --git a/app/assets/javascripts/components/Button.tsx b/app/assets/javascripts/components/Button.tsx
index 8ac16a5be..f91177d0b 100644
--- a/app/assets/javascripts/components/Button.tsx
+++ b/app/assets/javascripts/components/Button.tsx
@@ -1,60 +1,79 @@
 import { JSXInternal } from 'preact/src/jsx';
-import TargetedEvent = JSXInternal.TargetedEvent;
-import TargetedMouseEvent = JSXInternal.TargetedMouseEvent;
-
 import { ComponentChildren, FunctionComponent, Ref } from 'preact';
 import { forwardRef } from 'preact/compat';
 
 const baseClass = `rounded px-4 py-1.75 font-bold text-sm fit-content`;
 
-type ButtonType = 'normal' | 'primary' | 'danger';
+type ButtonVariant = 'normal' | 'primary';
 
-const buttonClasses: { [type in ButtonType]: string } = {
-  normal: `${baseClass} bg-default color-text border-solid border-main border-1 focus:bg-contrast hover:bg-contrast`,
-  primary: `${baseClass} no-border bg-info color-info-contrast hover:brightness-130 focus:brightness-130`,
-  danger: `${baseClass} bg-default color-danger border-solid border-main border-1 focus:bg-contrast hover:bg-contrast`,
+const getClassName = (
+  variant: ButtonVariant,
+  danger: boolean,
+  disabled: boolean
+) => {
+  const borders =
+    variant === 'normal' ? 'border-solid border-main border-1' : 'no-border';
+  const cursor = disabled ? 'cursor-not-allowed' : 'cursor-pointer';
+
+  let colors =
+    variant === 'normal'
+      ? 'bg-default color-text'
+      : 'bg-info color-info-contrast';
+
+  let focusHoverStates =
+    variant === 'normal'
+      ? 'focus:bg-contrast hover:bg-contrast'
+      : 'hover:brightness-130 focus:brightness-130';
+
+  if (danger) {
+    colors =
+      variant === 'normal'
+        ? 'bg-default color-danger'
+        : 'bg-danger color-info-contrast';
+  }
+
+  if (disabled) {
+    colors =
+      variant === 'normal'
+        ? 'bg-default color-grey-2'
+        : 'bg-grey-2 color-info-contrast';
+    focusHoverStates =
+      variant === 'normal'
+        ? 'focus:bg-default hover:bg-default'
+        : 'focus:brightness-default hover:brightness-default';
+  }
+
+  return `${baseClass} ${colors} ${borders} ${focusHoverStates} ${cursor}`;
 };
 
-type ButtonProps = {
+type ButtonProps = JSXInternal.HTMLAttributes<HTMLButtonElement> & {
   children?: ComponentChildren;
   className?: string;
-  type: ButtonType;
+  variant?: ButtonVariant;
+  dangerStyle?: boolean;
   label?: string;
-  onClick: (
-    event:
-      | TargetedEvent<HTMLFormElement>
-      | TargetedMouseEvent<HTMLButtonElement>
-  ) => void;
-  onBlur?: (event: FocusEvent) => void;
-  disabled?: boolean;
 };
 
 export const Button: FunctionComponent<ButtonProps> = forwardRef(
   (
     {
-      type,
+      variant = 'normal',
       label,
       className = '',
-      onBlur,
-      onClick,
+      dangerStyle: danger = false,
       disabled = false,
       children,
+      ...props
     }: ButtonProps,
     ref: Ref<HTMLButtonElement>
   ) => {
-    const buttonClass = buttonClasses[type];
-    const cursorClass = disabled ? 'cursor-default' : 'cursor-pointer';
-
     return (
       <button
-        className={`${buttonClass} ${cursorClass} ${className}`}
-        onBlur={onBlur}
-        onClick={(e) => {
-          onClick(e);
-          e.preventDefault();
-        }}
+        type="button"
+        className={`${getClassName(variant, danger, disabled)} ${className}`}
         disabled={disabled}
         ref={ref}
+        {...props}
       >
         {label ?? children}
       </button>
diff --git a/app/assets/javascripts/components/Files/FilePreviewModal.tsx b/app/assets/javascripts/components/Files/FilePreviewModal.tsx
index 92e1128d5..e1d0b4b0b 100644
--- a/app/assets/javascripts/components/Files/FilePreviewModal.tsx
+++ b/app/assets/javascripts/components/Files/FilePreviewModal.tsx
@@ -111,7 +111,7 @@ export const FilePreviewModal: FunctionComponent<Props> = ({
           <div className="flex items-center">
             {objectUrl && (
               <Button
-                type="primary"
+                variant="primary"
                 className="mr-4"
                 onClick={() => {
                   application
@@ -151,7 +151,7 @@ export const FilePreviewModal: FunctionComponent<Props> = ({
                   </div>
                   <div className="flex items-center">
                     <Button
-                      type="primary"
+                      variant="primary"
                       className="mr-3"
                       onClick={() => {
                         getObjectUrl();
@@ -160,7 +160,7 @@ export const FilePreviewModal: FunctionComponent<Props> = ({
                       Try again
                     </Button>
                     <Button
-                      type="normal"
+                      variant="normal"
                       onClick={() => {
                         application.getAppState().files.downloadFile(file);
                       }}
@@ -176,7 +176,7 @@ export const FilePreviewModal: FunctionComponent<Props> = ({
                     application.
                   </div>
                   <Button
-                    type="primary"
+                    variant="primary"
                     onClick={() => {
                       application.getAppState().files.downloadFile(file);
                     }}
diff --git a/app/assets/javascripts/components/Preferences/panes/Extensions.tsx b/app/assets/javascripts/components/Preferences/panes/Extensions.tsx
index 09f90fc9a..8c7c9a8e0 100644
--- a/app/assets/javascripts/components/Preferences/panes/Extensions.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/Extensions.tsx
@@ -120,7 +120,7 @@ export const Extensions: FunctionComponent<{
             <div className="min-h-2" />
             <Button
               className="min-w-20"
-              type="normal"
+              variant="normal"
               label="Install"
               onClick={() => submitExtensionUrl(customUrl)}
             />
diff --git a/app/assets/javascripts/components/Preferences/panes/Listed.tsx b/app/assets/javascripts/components/Preferences/panes/Listed.tsx
index 8e4bf55df..5e9c8be48 100644
--- a/app/assets/javascripts/components/Preferences/panes/Listed.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/Listed.tsx
@@ -102,7 +102,7 @@ export const Listed = observer(({ application }: Props) => {
           <Text>Create a free Listed author account to get started.</Text>
           <Button
             className="mt-3"
-            type="normal"
+            variant="normal"
             disabled={requestingAccount}
             label={
               requestingAccount ? 'Creating account...' : 'Create new author'
diff --git a/app/assets/javascripts/components/Preferences/panes/account/Authentication.tsx b/app/assets/javascripts/components/Preferences/panes/account/Authentication.tsx
index cdb1068d8..fd04395d4 100644
--- a/app/assets/javascripts/components/Preferences/panes/account/Authentication.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/account/Authentication.tsx
@@ -39,7 +39,7 @@ export const Authentication: FunctionComponent<{
             and enable end-to-end encryption.
           </Text>
           <Button
-            type="primary"
+            variant="primary"
             label="Create free account"
             onClick={clickRegister}
             className="mb-3"
diff --git a/app/assets/javascripts/components/Preferences/panes/account/Credentials.tsx b/app/assets/javascripts/components/Preferences/panes/account/Credentials.tsx
index b15e863f9..397c57c28 100644
--- a/app/assets/javascripts/components/Preferences/panes/account/Credentials.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/account/Credentials.tsx
@@ -50,7 +50,7 @@ export const Credentials: FunctionComponent<Props> = observer(
           </Text>
           <Button
             className="min-w-20 mt-3"
-            type="normal"
+            variant="normal"
             label="Change email"
             onClick={() => {
               setIsChangeEmailDialogOpen(true);
@@ -64,7 +64,7 @@ export const Credentials: FunctionComponent<Props> = observer(
           </Text>
           <Button
             className="min-w-20 mt-3"
-            type="normal"
+            variant="normal"
             label="Change password"
             onClick={presentPasswordWizard}
           />
diff --git a/app/assets/javascripts/components/Preferences/panes/account/SignOutView.tsx b/app/assets/javascripts/components/Preferences/panes/account/SignOutView.tsx
index f32db9fa6..0fe84cbba 100644
--- a/app/assets/javascripts/components/Preferences/panes/account/SignOutView.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/account/SignOutView.tsx
@@ -27,14 +27,14 @@ const SignOutView: FunctionComponent<{
           <div className="flex flex-row">
             <Button
               className="mr-3"
-              type="normal"
+              variant="normal"
               label="Sign out other sessions"
               onClick={() => {
                 appState.accountMenu.setOtherSessionsSignOut(true);
               }}
             />
             <Button
-              type="normal"
+              variant="normal"
               label="Manage sessions"
               onClick={() => appState.openSessionsModal()}
             />
@@ -48,7 +48,7 @@ const SignOutView: FunctionComponent<{
           </Text>
           <div className="min-h-3" />
           <Button
-            type="danger"
+            dangerStyle={true}
             label="Sign out workspace"
             onClick={() => {
               appState.accountMenu.setSigningOut(true);
@@ -76,7 +76,7 @@ const ClearSessionDataView: FunctionComponent<{
         </Text>
         <div className="min-h-3" />
         <Button
-          type="danger"
+          dangerStyle={true}
           label="Clear workspace"
           onClick={() => {
             appState.accountMenu.setSigningOut(true);
diff --git a/app/assets/javascripts/components/Preferences/panes/account/Sync.tsx b/app/assets/javascripts/components/Preferences/panes/account/Sync.tsx
index bd2340de1..6b29553ac 100644
--- a/app/assets/javascripts/components/Preferences/panes/account/Sync.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/account/Sync.tsx
@@ -55,7 +55,7 @@ export const Sync: FunctionComponent<Props> = observer(
               </Text>
               <Button
                 className="min-w-20 mt-3"
-                type="normal"
+                variant="normal"
                 label="Sync now"
                 disabled={isSyncingInProgress}
                 onClick={doSynchronization}
diff --git a/app/assets/javascripts/components/Preferences/panes/account/changeEmail/index.tsx b/app/assets/javascripts/components/Preferences/panes/account/changeEmail/index.tsx
index cc98e92e0..9dc0e45ae 100644
--- a/app/assets/javascripts/components/Preferences/panes/account/changeEmail/index.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/account/changeEmail/index.tsx
@@ -169,7 +169,7 @@ export const ChangeEmail: FunctionalComponent<Props> = ({
         <ModalDialogButtons className="px-4.5">
           <Button
             className="min-w-20"
-            type="primary"
+            variant="primary"
             label={submitButtonTitle}
             onClick={handleSubmit}
           />
diff --git a/app/assets/javascripts/components/Preferences/panes/account/offlineSubscription.tsx b/app/assets/javascripts/components/Preferences/panes/account/offlineSubscription.tsx
index 7b6ec8fb5..eac3c9e9b 100644
--- a/app/assets/javascripts/components/Preferences/panes/account/offlineSubscription.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/account/offlineSubscription.tsx
@@ -2,8 +2,6 @@ import { FunctionalComponent } from 'preact';
 import { Subtitle } from '@/components/Preferences/components';
 import { DecoratedInput } from '@/components/DecoratedInput';
 import { Button } from '@/components/Button';
-import { JSXInternal } from '@node_modules/preact/src/jsx';
-import TargetedEvent = JSXInternal.TargetedEvent;
 import { useEffect, useState } from 'preact/hooks';
 import { WebApplication } from '@/ui_models/application';
 import { AppState } from '@/ui_models/app_state';
@@ -40,9 +38,7 @@ export const OfflineSubscription: FunctionalComponent<IProps> = observer(
       );
     };
 
-    const handleSubscriptionCodeSubmit = async (
-      event: TargetedEvent<HTMLFormElement, Event>
-    ) => {
+    const handleSubscriptionCodeSubmit = async (event: Event) => {
       event.preventDefault();
 
       const result = await application.features.setOfflineFeaturesCode(
@@ -117,7 +113,7 @@ export const OfflineSubscription: FunctionalComponent<IProps> = observer(
               )}
               {hasUserPreviouslyStoredCode && (
                 <Button
-                  type="danger"
+                  dangerStyle={true}
                   label="Remove offline key"
                   onClick={() => {
                     handleRemoveClick();
@@ -127,13 +123,9 @@ export const OfflineSubscription: FunctionalComponent<IProps> = observer(
               {!hasUserPreviouslyStoredCode && !isSuccessfullyActivated && (
                 <Button
                   label={'Submit'}
-                  type="primary"
+                  variant="primary"
                   disabled={activationCode === ''}
-                  onClick={(event) =>
-                    handleSubscriptionCodeSubmit(
-                      event as TargetedEvent<HTMLFormElement>
-                    )
-                  }
+                  onClick={(event) => handleSubscriptionCodeSubmit(event)}
                 />
               )}
             </form>
diff --git a/app/assets/javascripts/components/Preferences/panes/account/subscription/NoSubscription.tsx b/app/assets/javascripts/components/Preferences/panes/account/subscription/NoSubscription.tsx
index 65aa4f41c..b10834f69 100644
--- a/app/assets/javascripts/components/Preferences/panes/account/subscription/NoSubscription.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/account/subscription/NoSubscription.tsx
@@ -46,7 +46,7 @@ export const NoSubscription: FunctionalComponent<{
         {application.hasAccount() && (
           <Button
             className="min-w-20 mt-3"
-            type="primary"
+            variant="primary"
             label="Subscribe"
             onClick={onPurchaseClick}
           />
diff --git a/app/assets/javascripts/components/Preferences/panes/account/subscription/SubscriptionInformation.tsx b/app/assets/javascripts/components/Preferences/panes/account/subscription/SubscriptionInformation.tsx
index 8bce383bf..fab42d9a0 100644
--- a/app/assets/javascripts/components/Preferences/panes/account/subscription/SubscriptionInformation.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/account/subscription/SubscriptionInformation.tsx
@@ -81,7 +81,7 @@ export const SubscriptionInformation = observer(
         <StatusText subscriptionState={subscriptionState} />
         <Button
           className="min-w-20 mt-3 mr-3"
-          type="normal"
+          variant="normal"
           label="Manage subscription"
           onClick={manageSubscription}
         />
diff --git a/app/assets/javascripts/components/Preferences/panes/backups-segments/DataBackups.tsx b/app/assets/javascripts/components/Preferences/panes/backups-segments/DataBackups.tsx
index df9040979..9218952df 100644
--- a/app/assets/javascripts/components/Preferences/panes/backups-segments/DataBackups.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/backups-segments/DataBackups.tsx
@@ -201,7 +201,7 @@ export const DataBackups = observer(({ application, appState }: Props) => {
           )}
 
           <Button
-            type="normal"
+            variant="normal"
             onClick={downloadDataArchive}
             label="Download backup"
             className="mt-2"
@@ -212,7 +212,7 @@ export const DataBackups = observer(({ application, appState }: Props) => {
 
           <div class="flex flex-row items-center mt-3">
             <Button
-              type="normal"
+              variant="normal"
               label="Import backup"
               onClick={handleImportFile}
             />
diff --git a/app/assets/javascripts/components/Preferences/panes/backups-segments/cloud-backups/CloudBackupProvider.tsx b/app/assets/javascripts/components/Preferences/panes/backups-segments/cloud-backups/CloudBackupProvider.tsx
index 286a7df5d..64806d0ec 100644
--- a/app/assets/javascripts/components/Preferences/panes/backups-segments/cloud-backups/CloudBackupProvider.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/backups-segments/cloud-backups/CloudBackupProvider.tsx
@@ -222,7 +222,7 @@ export const CloudBackupProvider: FunctionComponent<Props> = ({
       {shouldShowEnableButton && (
         <div>
           <Button
-            type="normal"
+            variant="normal"
             label="Enable"
             className={`px-1 text-xs min-w-40 ${additionalClass}`}
             onClick={installIntegration}
@@ -235,13 +235,13 @@ export const CloudBackupProvider: FunctionComponent<Props> = ({
         <div className={'flex flex-col items-end'}>
           <Button
             className={`min-w-40 mb-2 ${additionalClass}`}
-            type="normal"
+            variant="normal"
             label="Perform Backup"
             onClick={performBackupNow}
           />
           <Button
             className="min-w-40"
-            type="normal"
+            variant="normal"
             label="Disable"
             onClick={disable}
           />
diff --git a/app/assets/javascripts/components/Preferences/panes/extensions-segments/ConfirmCustomExtension.tsx b/app/assets/javascripts/components/Preferences/panes/extensions-segments/ConfirmCustomExtension.tsx
index 4191e6e39..362d3d24c 100644
--- a/app/assets/javascripts/components/Preferences/panes/extensions-segments/ConfirmCustomExtension.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/extensions-segments/ConfirmCustomExtension.tsx
@@ -56,7 +56,7 @@ export const ConfirmCustomExtension: FunctionComponent<{
       <div className="flex flex-row">
         <Button
           className="min-w-20"
-          type="normal"
+          variant="normal"
           label="Cancel"
           onClick={() => callback(false)}
         />
@@ -65,7 +65,7 @@ export const ConfirmCustomExtension: FunctionComponent<{
 
         <Button
           className="min-w-20"
-          type="normal"
+          variant="normal"
           label="Install"
           onClick={() => callback(true)}
         />
diff --git a/app/assets/javascripts/components/Preferences/panes/extensions-segments/ExtensionItem.tsx b/app/assets/javascripts/components/Preferences/panes/extensions-segments/ExtensionItem.tsx
index 5118fbede..4dab16adb 100644
--- a/app/assets/javascripts/components/Preferences/panes/extensions-segments/ExtensionItem.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/extensions-segments/ExtensionItem.tsx
@@ -104,7 +104,7 @@ export const ExtensionItem: FunctionComponent<ExtensionItemProps> = ({
         <div className="flex flex-row">
           <Button
             className="min-w-20"
-            type="normal"
+            variant="normal"
             label="Uninstall"
             onClick={() => uninstall(extension)}
           />
diff --git a/app/assets/javascripts/components/Preferences/panes/security-segments/PasscodeLock.tsx b/app/assets/javascripts/components/Preferences/panes/security-segments/PasscodeLock.tsx
index 9d2e61483..e44f411ba 100644
--- a/app/assets/javascripts/components/Preferences/panes/security-segments/PasscodeLock.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/security-segments/PasscodeLock.tsx
@@ -224,7 +224,7 @@ export const PasscodeLock = observer(({ application, appState }: Props) => {
                 <Button
                   label="Add passcode"
                   onClick={handleAddPassCode}
-                  type="primary"
+                  variant="primary"
                 />
               )}
             </>
@@ -258,13 +258,13 @@ export const PasscodeLock = observer(({ application, appState }: Props) => {
               />
               <div className="min-h-2" />
               <Button
-                type="primary"
+                variant="primary"
                 onClick={submitPasscodeForm}
                 label="Set Passcode"
                 className="mr-3"
               />
               <Button
-                type="normal"
+                variant="normal"
                 onClick={() => setShowPasscodeForm(false)}
                 label="Cancel"
               />
@@ -276,13 +276,13 @@ export const PasscodeLock = observer(({ application, appState }: Props) => {
               <Text>Passcode lock is enabled.</Text>
               <div className="flex flex-row mt-3">
                 <Button
-                  type="normal"
+                  variant="normal"
                   label="Change Passcode"
                   onClick={changePasscodePressed}
                   className="mr-3"
                 />
                 <Button
-                  type="danger"
+                  dangerStyle={true}
                   label="Remove Passcode"
                   onClick={removePasscodePressed}
                 />
diff --git a/app/assets/javascripts/components/Preferences/panes/security-segments/Protections.tsx b/app/assets/javascripts/components/Preferences/panes/security-segments/Protections.tsx
index 02358ca47..c0a7a93be 100644
--- a/app/assets/javascripts/components/Preferences/panes/security-segments/Protections.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/security-segments/Protections.tsx
@@ -107,7 +107,7 @@ export const Protections: FunctionalComponent<Props> = ({ application }) => {
         {protectionsDisabledUntil && (
           <Button
             className="mt-3"
-            type="primary"
+            variant="primary"
             label="End Unprotected Access"
             onClick={enableProtections}
           />
diff --git a/app/assets/javascripts/components/Preferences/panes/two-factor-auth/SaveSecretKey.tsx b/app/assets/javascripts/components/Preferences/panes/two-factor-auth/SaveSecretKey.tsx
index 68fc98c1b..a52c746dc 100644
--- a/app/assets/javascripts/components/Preferences/panes/two-factor-auth/SaveSecretKey.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/two-factor-auth/SaveSecretKey.tsx
@@ -78,13 +78,13 @@ export const SaveSecretKey: FunctionComponent<{
       <ModalDialogButtons>
         <Button
           className="min-w-20"
-          type="normal"
+          variant="normal"
           label="Back"
           onClick={() => act.openScanQRCode()}
         />
         <Button
           className="min-w-20"
-          type="primary"
+          variant="primary"
           label="Next"
           onClick={() => act.openVerification()}
         />
diff --git a/app/assets/javascripts/components/Preferences/panes/two-factor-auth/ScanQRCode.tsx b/app/assets/javascripts/components/Preferences/panes/two-factor-auth/ScanQRCode.tsx
index bf248d418..73906a545 100644
--- a/app/assets/javascripts/components/Preferences/panes/two-factor-auth/ScanQRCode.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/two-factor-auth/ScanQRCode.tsx
@@ -63,13 +63,13 @@ export const ScanQRCode: FunctionComponent<{
       <ModalDialogButtons>
         <Button
           className="min-w-20"
-          type="normal"
+          variant="normal"
           label="Cancel"
           onClick={() => act.cancelActivation()}
         />
         <Button
           className="min-w-20"
-          type="primary"
+          variant="primary"
           label="Next"
           onClick={() => act.openSaveSecretKey()}
         />
diff --git a/app/assets/javascripts/components/Preferences/panes/two-factor-auth/TwoFactorSuccess.tsx b/app/assets/javascripts/components/Preferences/panes/two-factor-auth/TwoFactorSuccess.tsx
index 83eac38c3..956940153 100644
--- a/app/assets/javascripts/components/Preferences/panes/two-factor-auth/TwoFactorSuccess.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/two-factor-auth/TwoFactorSuccess.tsx
@@ -27,7 +27,7 @@ export const TwoFactorSuccess: FunctionComponent<{
     <ModalDialogButtons>
       <Button
         className="min-w-20"
-        type="primary"
+        variant="primary"
         label="Finish"
         onClick={act.finishActivation}
       />
diff --git a/app/assets/javascripts/components/Preferences/panes/two-factor-auth/Verification.tsx b/app/assets/javascripts/components/Preferences/panes/two-factor-auth/Verification.tsx
index 199358090..39f4f33d4 100644
--- a/app/assets/javascripts/components/Preferences/panes/two-factor-auth/Verification.tsx
+++ b/app/assets/javascripts/components/Preferences/panes/two-factor-auth/Verification.tsx
@@ -65,13 +65,13 @@ export const Verification: FunctionComponent<{
         )}
         <Button
           className="min-w-20"
-          type="normal"
+          variant="normal"
           label="Back"
           onClick={act.openSaveSecretKey}
         />
         <Button
           className="min-w-20"
-          type="primary"
+          variant="primary"
           label="Next"
           onClick={act.enable2FA}
         />
diff --git a/app/assets/javascripts/components/PurchaseFlow/panes/CreateAccount.tsx b/app/assets/javascripts/components/PurchaseFlow/panes/CreateAccount.tsx
index a02d9c315..649996905 100644
--- a/app/assets/javascripts/components/PurchaseFlow/panes/CreateAccount.tsx
+++ b/app/assets/javascripts/components/PurchaseFlow/panes/CreateAccount.tsx
@@ -204,7 +204,7 @@ export const CreateAccount: FunctionComponent<Props> = observer(
             </div>
             <Button
               className="py-2.5 xs:mb-4"
-              type="primary"
+              variant="primary"
               label={
                 isCreatingAccount ? 'Creating account...' : 'Create account'
               }
diff --git a/app/assets/javascripts/components/PurchaseFlow/panes/SignIn.tsx b/app/assets/javascripts/components/PurchaseFlow/panes/SignIn.tsx
index 99557ad70..5c6e3e885 100644
--- a/app/assets/javascripts/components/PurchaseFlow/panes/SignIn.tsx
+++ b/app/assets/javascripts/components/PurchaseFlow/panes/SignIn.tsx
@@ -151,7 +151,7 @@ export const SignIn: FunctionComponent<Props> = observer(
             </div>
             <Button
               className={`${isSigningIn ? 'min-w-30' : 'min-w-24'} py-2.5 mb-5`}
-              type="primary"
+              variant="primary"
               label={isSigningIn ? 'Signing in...' : 'Sign in'}
               onClick={handleSignIn}
               disabled={isSigningIn}
diff --git a/app/assets/javascripts/components/RevisionHistoryModal/RevisionContentLocked.tsx b/app/assets/javascripts/components/RevisionHistoryModal/RevisionContentLocked.tsx
index 3f73c3f23..afc4a54d6 100644
--- a/app/assets/javascripts/components/RevisionHistoryModal/RevisionContentLocked.tsx
+++ b/app/assets/javascripts/components/RevisionHistoryModal/RevisionContentLocked.tsx
@@ -46,7 +46,7 @@ export const RevisionContentLocked: FunctionComponent<{
           . Learn more about our other plans to upgrade your history capacity.
         </div>
         <Button
-          type="primary"
+          variant="primary"
           label="Discover plans"
           onClick={() => {
             if (window.plansUrl) {
diff --git a/app/assets/javascripts/components/RevisionHistoryModal/RevisionHistoryModalWrapper.tsx b/app/assets/javascripts/components/RevisionHistoryModal/RevisionHistoryModalWrapper.tsx
index 3c866cc51..2ec440528 100644
--- a/app/assets/javascripts/components/RevisionHistoryModal/RevisionHistoryModalWrapper.tsx
+++ b/app/assets/javascripts/components/RevisionHistoryModal/RevisionHistoryModalWrapper.tsx
@@ -292,7 +292,7 @@ export const RevisionHistoryModal: FunctionComponent<RevisionHistoryModalProps>
                   label="Close"
                   onClick={dismissModal}
                   ref={closeButtonRef}
-                  type="normal"
+                  variant="normal"
                 />
               </div>
               {selectedRevision && (
@@ -301,7 +301,7 @@ export const RevisionHistoryModal: FunctionComponent<RevisionHistoryModalProps>
                     <Button
                       className="py-1.35 mr-2.5"
                       onClick={deleteSelectedRevision}
-                      type="normal"
+                      variant="normal"
                     >
                       {isDeletingRevision ? (
                         <div className="sk-spinner my-1 w-3 h-3 spinner-info" />
@@ -314,13 +314,13 @@ export const RevisionHistoryModal: FunctionComponent<RevisionHistoryModalProps>
                     className="py-1.35 mr-2.5"
                     label="Restore as a copy"
                     onClick={restoreAsCopy}
-                    type="normal"
+                    variant="normal"
                   />
                   <Button
                     className="py-1.35"
                     label="Restore version"
                     onClick={restore}
-                    type="primary"
+                    variant="primary"
                   />
                 </div>
               )}
diff --git a/app/assets/stylesheets/_sn.scss b/app/assets/stylesheets/_sn.scss
index 4a1cbf0c8..f2e8bdcbd 100644
--- a/app/assets/stylesheets/_sn.scss
+++ b/app/assets/stylesheets/_sn.scss
@@ -1045,3 +1045,19 @@
 .vertical-middle {
   vertical-align: middle;
 }
+
+.sn-component .focus\:brightness-default:focus {
+  filter: brightness(100%);
+}
+
+.sn-component .hover\:brightness-default:hover {
+  filter: brightness(100%);
+}
+
+.sn-component .focus\:bg-default:focus {
+  background-color: var(--sn-stylekit-background-color);
+}
+
+.sn-component .hover\:bg-default:hover {
+  background-color: var(--sn-stylekit-background-color);
+}