diff --git a/packages/editor-ui/src/components/CredentialsInput.vue b/packages/editor-ui/src/components/CredentialsInput.vue
index 8b277155c1..c9f17852ce 100644
--- a/packages/editor-ui/src/components/CredentialsInput.vue
+++ b/packages/editor-ui/src/components/CredentialsInput.vue
@@ -41,15 +41,11 @@
 			</el-col>
 			<el-col :span="18">
 				<span v-if="requiredPropertiesFilled === false">
-					<el-button title="Connect OAuth Credentials" circle :disabled="true">
-						<font-awesome-icon icon="redo" />
-					</el-button>
+					<n8n-icon-button title="Connect OAuth Credentials" icon="redo" :disabled="true" size="lg" />
 					Enter all required properties
 				</span>
 				<span v-else-if="isOAuthConnected === true">
-					<el-button title="Reconnect OAuth Credentials" @click.stop="oAuthCredentialAuthorize()" circle>
-						<font-awesome-icon icon="redo" />
-					</el-button>
+					<n8n-icon-button title="Reconnect OAuth Credentials" @click.stop="oAuthCredentialAuthorize()" icon="redo" size="lg" />
 					Connected
 				</span>
 				<span v-else>
@@ -57,9 +53,7 @@
 						<img :src="basePath + 'google-signin.png'" class="google-icon clickable" alt="Sign in with Google" @click.stop="oAuthCredentialAuthorize()" />
 					</span>
 					<span v-else>
-						<el-button title="Connect OAuth Credentials" @click.stop="oAuthCredentialAuthorize()" circle>
-							<font-awesome-icon icon="sign-in-alt" />
-						</el-button>
+						<n8n-icon-button title="Connect OAuth Credentials" @click.stop="oAuthCredentialAuthorize()" icon="sign-in-alt" size="lg" />
 						Not connected
 					</span>
 				</span>
diff --git a/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue b/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
index 37e1dbf325..f009d48256 100644
--- a/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
+++ b/packages/editor-ui/src/components/DuplicateWorkflowDialog.vue
@@ -29,8 +29,10 @@
 			</el-row>
 		</template>
 		<template v-slot:footer="{ close }">
-			<n8n-button @click="save" :loading="isSaving" label="Save" />
-			<n8n-button @click="close" :disabled="isSaving" label="Cancel" />
+			<div :class="$style.footer">
+				<n8n-button @click="save" :loading="isSaving" label="Save" float="right" />
+				<n8n-button type="outline" @click="close" :disabled="isSaving" label="Cancel" float="right" />
+			</div>
 		</template>
 	</Modal>
 </template>
@@ -122,4 +124,12 @@ export default mixins(showMessage, workflowHelpers).extend({
 		},
 	},
 });
-</script>
\ No newline at end of file
+</script>
+
+<style lang="scss" module>
+.footer {
+	> * {
+		margin-left: var(--spacing-3xs);
+	}
+}
+</style>
\ No newline at end of file
diff --git a/packages/editor-ui/src/components/Modal.vue b/packages/editor-ui/src/components/Modal.vue
index e73daea116..291ad35056 100644
--- a/packages/editor-ui/src/components/Modal.vue
+++ b/packages/editor-ui/src/components/Modal.vue
@@ -146,9 +146,4 @@ export default Vue.extend({
 .modal-content > .el-row {
 	margin-bottom: 15px;
 }
-
-.modal-footer > .el-button {
-	float: right;
-	margin-left: 5px;
-}
 </style>
\ No newline at end of file
diff --git a/packages/editor-ui/src/components/TagsManager/TagsManager.vue b/packages/editor-ui/src/components/TagsManager/TagsManager.vue
index 823095708b..bd3886b081 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsManager.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsManager.vue
@@ -24,7 +24,7 @@
 			</el-row>
 		</template>
 		<template v-slot:footer="{ close }">
-				<n8n-button size="sm" label="Done" @click="close" />
+			<n8n-button size="sm" label="Done" @click="close" float="right" />
 		</template>
 	</Modal>
 </template>
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
index daa1546cd7..b0ee715e5f 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
@@ -181,8 +181,9 @@ export default Vue.extend({
 	align-items: center;
 	display: flex;
 	flex-wrap: nowrap;
+	float: right;
 
-	> .el-button {
+	> * {
 		margin: 2px;
 	}
 }
@@ -197,9 +198,8 @@ export default Vue.extend({
 	opacity: 0;
 }
 
-.ops.main > .el-button {
+.ops.main {
 	display: none;
-	float: right;
 	margin-left: 2px;
 }
 
@@ -207,8 +207,8 @@ export default Vue.extend({
 	pointer-events: none;
 }
 
-/deep/ tr:hover .ops:not(.disabled) .el-button {
-	display: block;
+tr:hover .ops:not(.disabled) {
+	display: flex;
 }
 
 /deep/ .el-input.is-disabled > input {
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
index 1f99e635d4..0985fce12f 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTableHeader.vue
@@ -13,7 +13,7 @@
 			</el-input>
 		</el-col>
 		<el-col :span="14">
-			<n8n-button @click="onAddNew" :disabled="disabled" icon="plus" label="Add new" size="lg" />
+			<n8n-button @click="onAddNew" :disabled="disabled" icon="plus" label="Add new" size="lg" float="right" />
 		</el-col>
 	</el-row>
 </template>
@@ -50,8 +50,4 @@ export default Vue.extend({
 .tags-header {
 	margin-bottom: 15px;
 }
-
-.el-button {
-	float: right;
-}
 </style>
\ No newline at end of file