diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
index 714b85fff..e1617ed60 100644
--- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
+++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx
@@ -243,7 +243,7 @@ export function JobsConvertButton({
           <Switch />
         </Form.Item>
         <Space wrap>
-          <Button type="danger" onClick={() => form.submit()} loading={loading}>
+          <Button type="primary" danger onClick={() => form.submit()} loading={loading}>
             {t("jobs.actions.convert")}
           </Button>
           <Button onClick={() => setVisible(false)}>
@@ -260,7 +260,8 @@ export function JobsConvertButton({
     <Popover open={visible} content={popMenu}>
       <Button
         key="convert"
-        type="danger"
+        type="primary"
+        danger
         // style={{ display: job.converted ? "none" : "" }}
         disabled={job.converted || jobRO}
         loading={loading}
diff --git a/client/src/components/owner-detail-form/owner-detail-form.container.jsx b/client/src/components/owner-detail-form/owner-detail-form.container.jsx
index d93ec0f6a..80d88e1d4 100644
--- a/client/src/components/owner-detail-form/owner-detail-form.container.jsx
+++ b/client/src/components/owner-detail-form/owner-detail-form.container.jsx
@@ -76,7 +76,8 @@ function OwnerDetailFormContainer({ owner, refetch }) {
             title={t("owners.labels.deleteconfirm")}
           >
             <Button
-              type="danger"
+              type="primary"
+              danger
               loading={loading}
               disabled={owner.jobs.length !== 0}
             >
diff --git a/client/src/components/phonebook-form/phonebook-form.component.jsx b/client/src/components/phonebook-form/phonebook-form.component.jsx
index 9a9db0cfa..309da15d5 100644
--- a/client/src/components/phonebook-form/phonebook-form.component.jsx
+++ b/client/src/components/phonebook-form/phonebook-form.component.jsx
@@ -65,7 +65,8 @@ export function PhonebookFormComponent({
               {t("general.actions.save")}
             </Button>
             <Button
-              type="danger"
+              type="primary"
+              danger
               disabled={hasNoAccess}
               onClick={handleDelete}
               loading={formLoading}
diff --git a/client/src/components/production-list-save-config-button/production-list-save-config-button.component.jsx b/client/src/components/production-list-save-config-button/production-list-save-config-button.component.jsx
index 6db861329..0fdb87cc3 100644
--- a/client/src/components/production-list-save-config-button/production-list-save-config-button.component.jsx
+++ b/client/src/components/production-list-save-config-button/production-list-save-config-button.component.jsx
@@ -76,7 +76,7 @@ export function ProductionListSaveConfigButton({
         </Form.Item>
 
         <Space wrap>
-          <Button type="danger" onClick={() => form.submit()} loading={loading}>
+          <Button type="primary" danger onClick={() => form.submit()} loading={loading}>
             {t("general.actions.save")}
           </Button>
           <Button onClick={() => setVisible(false)}>
diff --git a/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx b/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
index 0fc7f9cd1..0d4c958b9 100644
--- a/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
+++ b/client/src/components/vehicle-detail-form/vehicle-detail-form.container.jsx
@@ -74,7 +74,8 @@ function VehicleDetailFormContainer({ vehicle, refetch }) {
             title={t("vehicles.labels.deleteconfirm")}
           >
             <Button
-              type="danger"
+              type="primary"
+              danger
               loading={loading}
               disabled={vehicle.jobs.length !== 0}
             >
diff --git a/client/src/components/vendors-form/vendors-form.component.jsx b/client/src/components/vendors-form/vendors-form.component.jsx
index 7639ad475..62089582a 100644
--- a/client/src/components/vendors-form/vendors-form.component.jsx
+++ b/client/src/components/vendors-form/vendors-form.component.jsx
@@ -64,7 +64,8 @@ export function VendorsFormComponent({bodyshop, form, formLoading, handleDelete,
                             {t("general.actions.save")}
                         </Button>
                         <Button
-                            type="danger"
+                            type="primary"
+                            danger
                             disabled={selectedvendor === "new"}
                             onClick={handleDelete}
                             loading={formLoading}
diff --git a/client/src/pages/jobs-close/jobs-close.component.jsx b/client/src/pages/jobs-close/jobs-close.component.jsx
index 38cf70c28..2a08e1944 100644
--- a/client/src/pages/jobs-close/jobs-close.component.jsx
+++ b/client/src/pages/jobs-close/jobs-close.component.jsx
@@ -178,7 +178,7 @@ export function JobsCloseComponent({ job, bodyshop, jobRO, insertAuditTrail, })
                 cancelText={t("general.labels.no")}
                 title={t("jobs.labels.closeconfirm")}
               >
-                <Button loading={loading} type="danger" disabled={jobRO}>
+                <Button loading={loading} type="primary" danger disabled={jobRO}>
                   {t("general.actions.close")}
                 </Button>
               </Popconfirm>