diff --git a/services/web/app/views/project/editor/history.pug b/services/web/app/views/project/editor/history.pug
index daac41f7fa..852c0dcaf3 100644
--- a/services/web/app/views/project/editor/history.pug
+++ b/services/web/app/views/project/editor/history.pug
@@ -77,7 +77,7 @@ script(type="text/ng-template", id="historyV2DeleteLabelModalTemplate")
 			strong  "{{ labelDetails.comment }}"
 			| ?
 	.modal-footer
-		button.btn.btn-default(
+		button.btn.btn-secondary(
 			type="button"
 			ng-disabled="state.inflight"
 			ng-click="$dismiss()"
diff --git a/services/web/app/views/project/editor/left-menu.pug b/services/web/app/views/project/editor/left-menu.pug
index f5d36a459b..0dda2b9cb0 100644
--- a/services/web/app/views/project/editor/left-menu.pug
+++ b/services/web/app/views/project/editor/left-menu.pug
@@ -120,7 +120,7 @@ aside#left-menu.full-size(
 			if dictionaryEditorEnabled
 				.form-controls(ng-controller="DictionaryModalController")
 					label #{translate("dictionary")}
-					button.btn.btn-default.btn-xs(ng-click="openModal()") #{translate("edit")}
+					button.btn.btn-secondary.btn-xs(ng-click="openModal()") #{translate("edit")}
 
 					dictionary-modal(
 						handle-hide="handleHide"
@@ -271,7 +271,7 @@ script(type='text/ng-template', id='cloneProjectModalTemplate')
 					focus-on="open"
 				)
 	.modal-footer
-		button.btn.btn-default(
+		button.btn.btn-secondary(
 			ng-disabled="state.inflight"
 			ng-click="cancel()"
 		) #{translate("cancel")}
@@ -318,7 +318,7 @@ script(type='text/ng-template', id='wordCountModalTemplate')
 						.pull-right #{translate("math_display")} :
 					.col-xs-6 {{data.mathDisplay}}
 	.modal-footer
-		button.btn.btn-default(
+		button.btn.btn-secondary(
 			ng-disabled="state.inflight"
 			ng-click="cancel()"
 		) #{translate("done")}
diff --git a/services/web/app/views/project/editor/new-file-modal.pug b/services/web/app/views/project/editor/new-file-modal.pug
index 9ab6832f12..9ef75879f1 100644
--- a/services/web/app/views/project/editor/new-file-modal.pug
+++ b/services/web/app/views/project/editor/new-file-modal.pug
@@ -63,7 +63,7 @@ script(type='text/ng-template', id='newFileModalTemplate')
 							p.text-center
 								a(href, ng-click="doUpload()").btn.btn-primary Overwrite
 								|  
-								a(href, ng-click="cancel()").btn.btn-default Cancel
+								a(href, ng-click="cancel()").btn.btn-secondary Cancel
 						div(
 							fine-upload
 							endpoint="/project/{{ project_id }}/upload"
@@ -194,7 +194,7 @@ script(type='text/ng-template', id='newFileModalTemplate')
 			|	#{translate("project_approaching_file_limit")} ({{file_count}}/2000)
 		.alert.alert-warning.at-file-limit(ng-if="file_count >= 2000")
 			|	#{translate("project_has_too_many_files")}
-		button.btn.btn-default(
+		button.btn.btn-secondary(
 			ng-disabled="state.inflight"
 			ng-click="cancel()"
 		) #{translate("cancel")}
diff --git a/services/web/app/views/project/editor/review-panel.pug b/services/web/app/views/project/editor/review-panel.pug
index ac6148ccb2..ec84bd97e4 100644
--- a/services/web/app/views/project/editor/review-panel.pug
+++ b/services/web/app/views/project/editor/review-panel.pug
@@ -615,7 +615,7 @@ script(type="text/ng-template", id="trackChangesUpgradeModalTemplate")
 			p(ng-show="project.owner._id != user.id"): strong #{translate("please_ask_the_project_owner_to_upgrade_to_track_changes")}
 
 	.modal-footer()
-		button.btn.btn-default(
+		button.btn.btn-secondary(
 			ng-click="cancel()"
 		)
 			span #{translate("close")}
@@ -634,7 +634,7 @@ script(type="text/ng-template", id="bulkActionsModalTemplate")
 		p(ng-if="isAccept") #{translate("bulk_accept_confirm", { nChanges: "{{ nChanges }}"})}
 		p(ng-if="!isAccept") #{translate("bulk_reject_confirm", { nChanges: "{{ nChanges }}"})}
 	.modal-footer()
-		button.btn.btn-default(
+		button.btn.btn-secondary(
 			ng-click="cancel()"
 		)
 			span #{translate("cancel")}
diff --git a/services/web/frontend/js/features/clone-project-modal/components/clone-project-modal-content.js b/services/web/frontend/js/features/clone-project-modal/components/clone-project-modal-content.js
index 831a19a818..55b8187806 100644
--- a/services/web/frontend/js/features/clone-project-modal/components/clone-project-modal-content.js
+++ b/services/web/frontend/js/features/clone-project-modal/components/clone-project-modal-content.js
@@ -97,7 +97,13 @@ export default function CloneProjectModalContent({
       </Modal.Body>
 
       <Modal.Footer>
-        <Button type="button" disabled={inFlight} onClick={handleHide}>
+        <Button
+          type="button"
+          bsStyle={null}
+          className="btn-secondary"
+          disabled={inFlight}
+          onClick={handleHide}
+        >
           {t('cancel')}
         </Button>
 
diff --git a/services/web/frontend/js/features/file-tree/components/file-tree-create/file-tree-modal-create-file-footer.js b/services/web/frontend/js/features/file-tree/components/file-tree-create/file-tree-modal-create-file-footer.js
index 1ca3165a76..326053c1fa 100644
--- a/services/web/frontend/js/features/file-tree/components/file-tree-create/file-tree-modal-create-file-footer.js
+++ b/services/web/frontend/js/features/file-tree/components/file-tree-create/file-tree-modal-create-file-footer.js
@@ -47,7 +47,8 @@ export function FileTreeModalCreateFileFooterContent({
       )}
 
       <Button
-        bsStyle="default"
+        bsStyle={null}
+        className="btn-secondary"
         type="button"
         disabled={inFlight}
         onClick={cancel}
diff --git a/services/web/frontend/js/features/pdf-preview/components/switch-to-editor-button.tsx b/services/web/frontend/js/features/pdf-preview/components/switch-to-editor-button.tsx
index f213c9173a..30742a7cc4 100644
--- a/services/web/frontend/js/features/pdf-preview/components/switch-to-editor-button.tsx
+++ b/services/web/frontend/js/features/pdf-preview/components/switch-to-editor-button.tsx
@@ -22,10 +22,10 @@ function SwitchToEditorButton() {
 
   return (
     <Button
-      bsStyle="default"
+      bsStyle={null}
       bsSize="xs"
       onClick={handleClick}
-      className="switch-to-editor-btn"
+      className="switch-to-editor-btn btn-secondary"
     >
       <Icon type="code" className="me-1" />
       {t('switch_to_editor')}
diff --git a/services/web/frontend/js/features/source-editor/components/switch-to-pdf-button.js b/services/web/frontend/js/features/source-editor/components/switch-to-pdf-button.js
index 155089d568..e3dcdd71ca 100644
--- a/services/web/frontend/js/features/source-editor/components/switch-to-pdf-button.js
+++ b/services/web/frontend/js/features/source-editor/components/switch-to-pdf-button.js
@@ -22,10 +22,10 @@ function SwitchToPDFButton() {
 
   return (
     <Button
-      bsStyle="default"
+      bsStyle={null}
       bsSize="xs"
       onClick={handleClick}
-      className="toolbar-btn-secondary"
+      className="toolbar-btn-secondary btn-secondary"
     >
       <Icon type="file-pdf-o" className="me-1" />
       {t('switch_to_pdf')}