diff --git a/src/CardMoveDialog.vue b/src/CardMoveDialog.vue
index af7072b75..56df94d20 100644
--- a/src/CardMoveDialog.vue
+++ b/src/CardMoveDialog.vue
@@ -22,10 +22,10 @@
 				label="title" />
 		</div>
 		<template #actions>
-			<NcButton :disabled="!isBoardAndStackChoosen" type="secondary" @click="moveCard">
+			<NcButton :disabled="!isBoardAndStackChoosen" variant="secondary" @click="moveCard">
 				{{ t('deck', 'Move card') }}
 			</NcButton>
-			<NcButton :disabled="!isBoardAndStackChoosen" type="primary" @click="cloneCard">
+			<NcButton :disabled="!isBoardAndStackChoosen" variant="primary" @click="cloneCard">
 				{{ t('deck', 'Copy card') }}
 			</NcButton>
 		</template>
diff --git a/src/components/Controls.vue b/src/components/Controls.vue
index 719f56113..74f894bb8 100644
--- a/src/components/Controls.vue
+++ b/src/components/Controls.vue
@@ -84,7 +84,7 @@
 								:title="t('deck', 'Apply filter')"
 								:aria-label="t('deck', 'Apply filter')"
 								class="filter-button"
-								:type="isFilterActive ? 'primary' : 'tertiary'">
+								:variant="isFilterActive ? 'primary' : 'tertiary'">
 								<template #icon>
 									<FilterIcon v-if="isFilterActive" :size="20" decorative />
 									<FilterOffIcon v-else :size="20" decorative />
diff --git a/src/components/board/Board.vue b/src/components/board/Board.vue
index 5c459d81d..09a1d4bc1 100644
--- a/src/components/board/Board.vue
+++ b/src/components/board/Board.vue
@@ -33,8 +33,8 @@
 							:disable="loading"
 							:placeholder="t('deck', 'List name')"
 							type="text" />
-						<NcButton type="secondary"
-							native-type="submit"
+						<NcButton variant="secondary"
+							type="submit"
 							:disabled="loading"
 							:title="t('deck', 'Add list')">
 							<template #icon>
diff --git a/src/components/card/DueDateSelector.vue b/src/components/card/DueDateSelector.vue
index 3ee2366c5..92c23e4c1 100644
--- a/src/components/card/DueDateSelector.vue
+++ b/src/components/card/DueDateSelector.vue
@@ -19,7 +19,7 @@
 				type="datetime-local" />
 			<NcActions v-if="canEdit"
 				:menu-title="!duedate ? t('deck', 'Add due date') : null"
-				type="tertiary"
+				variant="tertiary"
 				data-cy-due-date-actions>
 				<template v-if="!duedate" #icon>
 					<Plus :size="20" />
@@ -52,7 +52,7 @@
 			</NcActions>
 
 			<NcButton v-if="!card.done"
-				type="secondary"
+				variant="secondary"
 				class="completed-button"
 				@click="changeCardDoneStatus()">
 				<template #icon>
@@ -73,14 +73,14 @@
 			</div>
 			<div class="due-actions">
 				<NcButton v-if="!card.archived"
-					type="tertiary"
+					variant="tertiary"
 					:name="t('deck', 'Not done')"
 					@click="changeCardDoneStatus()">
 					<template #icon>
 						<ClearIcon :size="20" />
 					</template>
 				</NcButton>
-				<NcButton type="secondary" @click="archiveUnarchiveCard()">
+				<NcButton variant="secondary" @click="archiveUnarchiveCard()">
 					<template #icon>
 						<ArchiveIcon :size="20" />
 					</template>
diff --git a/src/components/cards/CardMenu.vue b/src/components/cards/CardMenu.vue
index 2948f42e9..c044d7839 100644
--- a/src/components/cards/CardMenu.vue
+++ b/src/components/cards/CardMenu.vue
@@ -6,7 +6,7 @@
 <template>
 	<div v-if="card" class="card-menu" @click.stop.prevent>
 		<NcButton v-if="card.referenceData"
-			type="tertiary"
+			variant="tertiary"
 			:title="t('deck', 'Open link')"
 			@click="openLink">
 			<template #icon>
diff --git a/src/components/navigation/AppNavigationAddBoard.vue b/src/components/navigation/AppNavigationAddBoard.vue
index 488b6dc67..77eebd217 100644
--- a/src/components/navigation/AppNavigationAddBoard.vue
+++ b/src/components/navigation/AppNavigationAddBoard.vue
@@ -18,7 +18,7 @@
 				:placeholder="t('deck', 'Board name')"
 				type="text"
 				required />
-			<NcButton type="tertiary"
+			<NcButton variant="tertiary"
 				:disabled="loading"
 				:title="t('deck', 'Cancel edit')"
 				@click.stop.prevent="cancelEdit">
@@ -26,8 +26,8 @@
 					<CloseIcon :size="20" />
 				</template>
 			</NcButton>
-			<NcButton type="tertiary"
-				native-type="submit"
+			<NcButton variant="tertiary"
+				type="submit"
 				:disabled="loading"
 				:title="t('deck', 'Save board')">
 				<template #icon>
@@ -77,6 +77,7 @@ export default {
 			})
 		},
 		async createBoard(e) {
+			alert('createBoard called')
 			this.loading = true
 			const title = this.value.trim()
 			await this.$store.dispatch('createBoard', {
@@ -88,6 +89,7 @@ export default {
 			this.color = randomColor()
 		},
 		cancelEdit(e) {
+			alert('cancelEdit called')
 			this.editing = false
 			this.color = randomColor()
 		},
diff --git a/src/components/navigation/AppNavigationBoard.vue b/src/components/navigation/AppNavigationBoard.vue
index 5d7d9bd7b..52bff78d1 100644
--- a/src/components/navigation/AppNavigationBoard.vue
+++ b/src/components/navigation/AppNavigationBoard.vue
@@ -129,17 +129,17 @@
 				:placeholder="t('deck', 'Board name')"
 				type="text"
 				required />
-			<NcButton type="tertiary"
+			<NcButton variant="tertiary"
 				:disabled="loading"
-				native-type="submit"
+				type="submit"
 				:title="t('deck', 'Cancel edit')"
 				@click.stop.prevent="cancelEdit">
 				<template #icon>
 					<CloseIcon :size="20" />
 				</template>
 			</NcButton>
-			<NcButton type="tertiary"
-				native-type="submit"
+			<NcButton variant="tertiary"
+				type="submit"
 				:disabled="loading"
 				:title="t('deck', 'Save board')">
 				<template #icon>
diff --git a/src/components/navigation/BoardCloneModal.vue b/src/components/navigation/BoardCloneModal.vue
index 10e802003..10fcf34c9 100644
--- a/src/components/navigation/BoardCloneModal.vue
+++ b/src/components/navigation/BoardCloneModal.vue
@@ -39,7 +39,7 @@
 			<NcButton @click="cancel">
 				{{ t('deck', 'Cancel') }}
 			</NcButton>
-			<NcButton type="primary" @click="save">
+			<NcButton variant="primary" @click="save">
 				{{ t('deck', 'Clone') }}
 			</NcButton>
 		</template>
diff --git a/src/components/navigation/BoardExportModal.vue b/src/components/navigation/BoardExportModal.vue
index 026aa5329..62dd8f9b2 100644
--- a/src/components/navigation/BoardExportModal.vue
+++ b/src/components/navigation/BoardExportModal.vue
@@ -27,7 +27,7 @@
 			<NcButton @click="close">
 				{{ t('deck', 'Cancel') }}
 			</NcButton>
-			<NcButton type="primary" @click="exportBoard">
+			<NcButton variant="primary" @click="exportBoard">
 				{{ t('deck', 'Export') }}
 			</NcButton>
 		</template>
diff --git a/src/views/CreateNewCardCustomPicker.vue b/src/views/CreateNewCardCustomPicker.vue
index 0f19ac3b6..aa5295c5f 100644
--- a/src/views/CreateNewCardCustomPicker.vue
+++ b/src/views/CreateNewCardCustomPicker.vue
@@ -82,7 +82,7 @@
 					{{ t('deck', 'Cancel') }}
 				</NcButton>
 				<NcButton :disabled="loading || !isBoardAndStackChoosen"
-					type="primary"
+					variant="primary"
 					@click="createCard">
 					{{ t('deck', 'Create card') }}
 				</NcButton>