diff --git a/apps/client/src/widgets/dialogs/bulk_actions.tsx b/apps/client/src/widgets/dialogs/bulk_actions.tsx
index 05033255c4..cbb04a404a 100644
--- a/apps/client/src/widgets/dialogs/bulk_actions.tsx
+++ b/apps/client/src/widgets/dialogs/bulk_actions.tsx
@@ -57,7 +57,7 @@ export default function BulkActionsDialog() {
             className="bulk-actions-dialog"
             size="xl"
             title={t("bulk_actions.bulk_actions")}
-            footer={<Button text={t("bulk_actions.execute_bulk_actions")} primary />}
+            footer={<Button text={t("bulk_actions.execute_bulk_actions")} kind="primary" />}
             show={shown}
             onSubmit={async () => {
                 await server.post("bulk-action/execute", {
diff --git a/apps/client/src/widgets/dialogs/delete_notes.tsx b/apps/client/src/widgets/dialogs/delete_notes.tsx
index bb1b4e7cd0..c58d440b72 100644
--- a/apps/client/src/widgets/dialogs/delete_notes.tsx
+++ b/apps/client/src/widgets/dialogs/delete_notes.tsx
@@ -72,7 +72,7 @@ export default function DeleteNotesDialog() {
             footer={<>
                 <Button text={t("delete_notes.cancel")}
                     onClick={() => setShown(false)} />
-                <Button text={t("delete_notes.ok")} primary
+                <Button text={t("delete_notes.ok")} kind="primary"
                     buttonRef={okButtonRef}
                     onClick={() => {
                         opts.callback?.({ proceed: true, deleteAllClones, eraseNotes });
diff --git a/apps/client/src/widgets/dialogs/export.tsx b/apps/client/src/widgets/dialogs/export.tsx
index 2f10f8063b..01caa7659f 100644
--- a/apps/client/src/widgets/dialogs/export.tsx
+++ b/apps/client/src/widgets/dialogs/export.tsx
@@ -58,7 +58,7 @@ export default function ExportDialog() {
                 setShown(false);
             }}
             onHidden={() => setShown(false)}
-            footer={<Button className="export-button" text={t("export.export")} primary />}
+            footer={<Button className="export-button" text={t("export.export")} kind="primary" />}
             show={shown}
         >
 
diff --git a/apps/client/src/widgets/dialogs/import.tsx b/apps/client/src/widgets/dialogs/import.tsx
index 46db5b8cd7..0c37466d59 100644
--- a/apps/client/src/widgets/dialogs/import.tsx
+++ b/apps/client/src/widgets/dialogs/import.tsx
@@ -55,7 +55,7 @@ export default function ImportDialog() {
                 setShown(false);
                 setFiles(null);
             }}
-            footer={<Button text={t("import.import")} primary disabled={!files} />}
+            footer={<Button text={t("import.import")} kind="primary" disabled={!files} />}
             show={shown}
         >
             <FormGroup name="files" label={t("import.chooseImportFile")} description={
diff --git a/apps/client/src/widgets/dialogs/prompt.tsx b/apps/client/src/widgets/dialogs/prompt.tsx
index 370cc34ed4..2ffd5056c3 100644
--- a/apps/client/src/widgets/dialogs/prompt.tsx
+++ b/apps/client/src/widgets/dialogs/prompt.tsx
@@ -69,7 +69,7 @@ export default function PromptDialog() {
                 submitValue.current = null;
                 opts.current = undefined;
             }}
-            footer={<Button text={t("prompt.ok")} keyboardShortcut="Enter" primary />}
+            footer={<Button text={t("prompt.ok")} keyboardShortcut="Enter" kind="primary" />}
             show={shown}
             stackable
         >
diff --git a/apps/client/src/widgets/dialogs/revisions.tsx b/apps/client/src/widgets/dialogs/revisions.tsx
index 1d11145f3e..41d22864f3 100644
--- a/apps/client/src/widgets/dialogs/revisions.tsx
+++ b/apps/client/src/widgets/dialogs/revisions.tsx
@@ -203,7 +203,7 @@ function RevisionPreview({noteContent, revisionItem, showDiff, setShown, onRevis
                                 }} />
                             &nbsp;
                             <Button
-                                primary
+                                kind="primary"
                                 icon="bx bx-download"
                                 text={t("revisions.download_button")}
                                 onClick={() => {
diff --git a/apps/client/src/widgets/dialogs/upload_attachments.tsx b/apps/client/src/widgets/dialogs/upload_attachments.tsx
index 7d3d54bda0..841dd69541 100644
--- a/apps/client/src/widgets/dialogs/upload_attachments.tsx
+++ b/apps/client/src/widgets/dialogs/upload_attachments.tsx
@@ -35,7 +35,7 @@ export default function UploadAttachmentsDialog() {
             className="upload-attachments-dialog"
             size="lg"
             title={t("upload_attachments.upload_attachments_to_note")}
-            footer={<Button text={t("upload_attachments.upload")} primary disabled={!files || isUploading} />}
+            footer={<Button text={t("upload_attachments.upload")} kind="primary" disabled={!files || isUploading} />}
             onSubmit={async () => {
                 if (!files || !parentNoteId) {
                     return;
diff --git a/apps/client/src/widgets/ribbon/FilePropertiesTab.tsx b/apps/client/src/widgets/ribbon/FilePropertiesTab.tsx
index bf843c41e8..2d93b29f54 100644
--- a/apps/client/src/widgets/ribbon/FilePropertiesTab.tsx
+++ b/apps/client/src/widgets/ribbon/FilePropertiesTab.tsx
@@ -43,7 +43,7 @@ export default function FilePropertiesTab({ note, ntxId }: Pick<TabContext, "not
                                     <Button
                                         icon="bx bx-download"
                                         text={t("file_properties.download")}
-                                        primary
+                                        kind="primary"
                                         disabled={!canAccessProtectedNote}
                                         onClick={() => downloadFileNote(note, parentComponent, ntxId)}
                                     />
diff --git a/apps/client/src/widgets/ribbon/ImagePropertiesTab.tsx b/apps/client/src/widgets/ribbon/ImagePropertiesTab.tsx
index 0e229dc994..c9e031863f 100644
--- a/apps/client/src/widgets/ribbon/ImagePropertiesTab.tsx
+++ b/apps/client/src/widgets/ribbon/ImagePropertiesTab.tsx
@@ -43,7 +43,7 @@ export default function ImagePropertiesTab({ note, ntxId }: TabContext) {
                         <Button
                             text={t("image_properties.download")}
                             icon="bx bx-download"
-                            primary
+                            kind="primary"
                             onClick={() => downloadFileNote(note, parentComponent, ntxId)}
                         />
 
diff --git a/apps/client/src/widgets/type_widgets/ProtectedSession.tsx b/apps/client/src/widgets/type_widgets/ProtectedSession.tsx
index 5f7b763501..a735f271e4 100644
--- a/apps/client/src/widgets/type_widgets/ProtectedSession.tsx
+++ b/apps/client/src/widgets/type_widgets/ProtectedSession.tsx
@@ -34,7 +34,7 @@ export default function ProtectedSession() {
 
             <Button
                 text={t("protected_session.start_session_button")}
-                primary
+                kind="primary"
                 keyboardShortcut="Enter"
             />
         </form>
diff --git a/apps/client/src/widgets/type_widgets/Render.tsx b/apps/client/src/widgets/type_widgets/Render.tsx
index 4d4fd4cd8e..46c2e3a7a8 100644
--- a/apps/client/src/widgets/type_widgets/Render.tsx
+++ b/apps/client/src/widgets/type_widgets/Render.tsx
@@ -107,7 +107,7 @@ function DisabledRender({ note }: TypeWidgetProps) {
                 text={t("render.disabled_button_enable")}
                 icon="bx bx-check-shield"
                 onClick={() => attributes.toggleDangerousAttribute(note, "relation", "renderNote", true)}
-                primary
+                kind="primary"
             />
         </SetupForm>
     );
diff --git a/apps/client/src/widgets/type_widgets/WebView.tsx b/apps/client/src/widgets/type_widgets/WebView.tsx
index d61725d064..dd3ab43c9e 100644
--- a/apps/client/src/widgets/type_widgets/WebView.tsx
+++ b/apps/client/src/widgets/type_widgets/WebView.tsx
@@ -74,7 +74,7 @@ function SetupWebView({note}: {note: FNote}) {
 
             <Button
                 text={t("web_view_setup.create_button")}
-                primary
+                kind="primary"
                 keyboardShortcut="Enter"
             />
         </SetupForm>
@@ -96,7 +96,7 @@ function DisabledWebView({ note, url }: { note: FNote, url: string }) {
                 text={t("web_view_setup.disabled_button_enable")}
                 icon="bx bx-check-shield"
                 onClick={() => attributes.toggleDangerousAttribute(note, "label", "webViewSrc", true)}
-                primary
+                kind="primary"
             />
         </SetupForm>
     );
diff --git a/apps/client/src/widgets/type_widgets/options/password.tsx b/apps/client/src/widgets/type_widgets/options/password.tsx
index 019d3bcbe7..6e2eec9581 100644
--- a/apps/client/src/widgets/type_widgets/options/password.tsx
+++ b/apps/client/src/widgets/type_widgets/options/password.tsx
@@ -95,7 +95,7 @@ function ChangePassword() {
 
                 <Button
                     text={t("password.change_password")}
-                    primary
+                    kind="primary"
                 />
             </form>
         </OptionsSection>
diff --git a/apps/client/src/widgets/type_widgets/options/sync.tsx b/apps/client/src/widgets/type_widgets/options/sync.tsx
index fbd2f6a60f..1ffb40f373 100644
--- a/apps/client/src/widgets/type_widgets/options/sync.tsx
+++ b/apps/client/src/widgets/type_widgets/options/sync.tsx
@@ -65,7 +65,7 @@ export function SyncConfiguration() {
                 </FormGroup>
 
                 <div style={{ display: "flex", justifyContent: "spaceBetween"}}>
-                    <Button text={t("sync_2.save")} primary />
+                    <Button text={t("sync_2.save")} kind="primary" />
                     <Button text={t("sync_2.help")} onClick={() => openInAppHelpFromUrl("cbkrhQjrkKrh")} />
                 </div>
             </form>