diff --git a/src/components/AppNavigation/Trashbin.vue b/src/components/AppNavigation/Trashbin.vue
index f0942cfc0..6c7efb29b 100644
--- a/src/components/AppNavigation/Trashbin.vue
+++ b/src/components/AppNavigation/Trashbin.vue
@@ -48,7 +48,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 							<NcButton class="table__header sort-button sort-button--summary"
 								:class="{ 'sort-button--active': sortOrder === 'summary' }"
 								alignment="center-reverse"
-								type="tertiary"
+								variant="tertiary"
 								@click="setSortOrder('summary')">
 								<template #icon>
 									<MenuDown v-if="sortDirection && sortOrder === 'summary'" />
@@ -59,7 +59,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 							<NcButton class="table__header table__header--deletedAt sort-button sort-button--deletedAt"
 								:class="{ 'sort-button--active': sortOrder === 'deletedAt' }"
 								alignment="center"
-								type="tertiary"
+								variant="tertiary"
 								@click="setSortOrder('deletedAt')">
 								<template #icon>
 									<MenuDown v-if="sortDirection && sortOrder === 'deletedAt'" />
@@ -108,7 +108,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 							<p v-if="retentionDuration">
 								{{ n('tasks', 'Elements in the trash bin are deleted after {numDays} day', 'Elements in the trash bin are deleted after {numDays} days', retentionDuration, { numDays: retentionDuration }) }}
 							</p>
-							<NcButton type="primary" @click="onEmptyTrashBin()">
+							<NcButton variant="primary" @click="onEmptyTrashBin()">
 								<template #icon>
 									<DeleteForever :size="20" />
 								</template>
diff --git a/src/components/AppSidebar/Alarm/AlarmDateTimePickerModal.vue b/src/components/AppSidebar/Alarm/AlarmDateTimePickerModal.vue
index cc8b64c85..8876ae375 100644
--- a/src/components/AppSidebar/Alarm/AlarmDateTimePickerModal.vue
+++ b/src/components/AppSidebar/Alarm/AlarmDateTimePickerModal.vue
@@ -20,7 +20,7 @@
 				<NcButton @click="onClose()">
 					{{ t('tasks', 'Cancel') }}
 				</NcButton>
-				<NcButton type="primary" native-type="submit">
+				<NcButton variant="primary" type="submit">
 					<template v-if="isNewAlarm">
 						{{ t('tasks', 'Create reminder') }}
 					</template>
diff --git a/src/components/AppSidebar/Alarm/AlarmRelativeTimePickerModal.vue b/src/components/AppSidebar/Alarm/AlarmRelativeTimePickerModal.vue
index 8f141ef5c..7b02c1701 100644
--- a/src/components/AppSidebar/Alarm/AlarmRelativeTimePickerModal.vue
+++ b/src/components/AppSidebar/Alarm/AlarmRelativeTimePickerModal.vue
@@ -48,7 +48,7 @@
 				<NcButton @click="onClose()">
 					{{ t('tasks', 'Cancel') }}
 				</NcButton>
-				<NcButton type="primary" @click="onSelectDateTime">
+				<NcButton variant="primary" @click="onSelectDateTime">
 					{{ t('tasks', 'Update reminder') }}
 				</NcButton>
 			</div>
diff --git a/src/components/CreateMultipleTasksDialog.vue b/src/components/CreateMultipleTasksDialog.vue
index 08846a551..0036bf680 100644
--- a/src/components/CreateMultipleTasksDialog.vue
+++ b/src/components/CreateMultipleTasksDialog.vue
@@ -28,7 +28,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 					{{ t('tasks', 'Cancel') }}
 				</NcButton>
 				<NcButton ref="createButton"
-					type="primary"
+					variant="primary"
 					@click="addTasks">
 					{{ t('tasks', 'Create tasks') }}
 				</NcButton>
diff --git a/src/components/DeleteCompletedModal.vue b/src/components/DeleteCompletedModal.vue
index 4c4809369..e7c6eeaee 100644
--- a/src/components/DeleteCompletedModal.vue
+++ b/src/components/DeleteCompletedModal.vue
@@ -22,7 +22,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 <template>
 	<div class="loadmore reactive">
 		<NcButton v-show="completedTasksCount"
-			type="tertiary"
+			variant="tertiary"
 			@click="openModal">
 			<template #icon>
 				<Delete :size="20" />
@@ -39,7 +39,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 					<h3>
 						{{ n('tasks', 'This will delete {taskCount} completed task and its subtasks from calendar "{calendar}".', 'This will delete {taskCount} completed tasks and their subtasks from calendar "{calendar}".', initialCompletedRootTasksCount, {taskCount: initialCompletedRootTasksCount, calendar: calendar.displayName}, { sanitize: false, escape: false }) }}
 					</h3>
-					<NcButton type="primary"
+					<NcButton variant="primary"
 						class="delete-completed__button"
 						@click="deleteCompletedTasks">
 						<template #icon>
diff --git a/src/components/LoadCompletedButton.vue b/src/components/LoadCompletedButton.vue
index 471bdacbe..df2f93309 100644
--- a/src/components/LoadCompletedButton.vue
+++ b/src/components/LoadCompletedButton.vue
@@ -23,7 +23,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 	<div v-show="!loadedCompleted"
 		:title="buttonStrings.tooltip"
 		class="loadmore reactive">
-		<NcButton type="tertiary"
+		<NcButton variant="tertiary"
 			@click="loadCompletedTasks">
 			<template #icon>
 				<CloudDownload :size="20" />
diff --git a/src/components/TaskCreateDialog.vue b/src/components/TaskCreateDialog.vue
index e70b9c6a2..d53a8b240 100644
--- a/src/components/TaskCreateDialog.vue
+++ b/src/components/TaskCreateDialog.vue
@@ -56,7 +56,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 					{{ t('tasks', 'Cancel') }}
 				</NcButton>
 				<NcButton :disabled="loading"
-					type="primary"
+					variant="primary"
 					@click="addTask">
 					{{ t('tasks', 'Create task') }}
 				</NcButton>
diff --git a/src/components/TaskStatusDisplay.vue b/src/components/TaskStatusDisplay.vue
index d73f4fcef..dcee9b246 100644
--- a/src/components/TaskStatusDisplay.vue
+++ b/src/components/TaskStatusDisplay.vue
@@ -23,7 +23,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 	<NcButton v-if="status"
 		:title="status.message"
 		:disabled="isDisabled"
-		type="tertiary"
+		variant="tertiary"
 		:aria-label="status.message"
 		@click="statusClicked">
 		<template #icon>
diff --git a/src/views/AppContent/Calendar.vue b/src/views/AppContent/Calendar.vue
index 2dadfe588..3f1d76584 100644
--- a/src/views/AppContent/Calendar.vue
+++ b/src/views/AppContent/Calendar.vue
@@ -32,7 +32,7 @@ License along with this library. If not, see <http://www.gnu.org/licenses/>.
 					collection-id="uncompleted" />
 				<NcButton v-if="closedCount(calendarId)"
 					alignment="center-reverse"
-					type="tertiary"
+					variant="tertiary"
 					class="reactive heading"
 					@click="toggleHidden">
 					<template #icon>