diff --git a/src/components/misc/Icon.ts b/src/components/misc/Icon.ts
index 392c030ef..57acbc8f5 100644
--- a/src/components/misc/Icon.ts
+++ b/src/components/misc/Icon.ts
@@ -2,6 +2,7 @@ import {library} from '@fortawesome/fontawesome-svg-core'
 import {
 	faAlignLeft,
 	faAngleRight,
+	faAnglesUp,
 	faArchive,
 	faArrowLeft,
 	faArrowUpFromBracket,
@@ -142,6 +143,7 @@ library.add(faUser)
 library.add(faUsers)
 library.add(faArrowUpFromBracket)
 library.add(faX)
+library.add(faAnglesUp)
 
 // overwriting the wrong types
 export default FontAwesomeIcon as unknown as FontAwesomeIconFixedTypes
\ No newline at end of file
diff --git a/src/components/misc/dropdown-item.vue b/src/components/misc/dropdown-item.vue
index 6dd837935..a1545975b 100644
--- a/src/components/misc/dropdown-item.vue
+++ b/src/components/misc/dropdown-item.vue
@@ -1,21 +1,26 @@
 <template>
 	<BaseButton class="dropdown-item">
-		<span class="icon" v-if="icon">
+		<span
+			v-if="icon"
+			class="icon is-small"
+			:class="iconClass"
+		>
 			<Icon :icon="icon"/>
 		</span>
 		<span>
-			<slot  />
+			<slot/>
 		</span>
 	</BaseButton>
 </template>
 
 <script lang="ts" setup>
-import BaseButton, { type BaseButtonProps } from '@/components/base//BaseButton.vue'
+import BaseButton, {type BaseButtonProps} from '@/components/base//BaseButton.vue'
 import Icon from '@/components/misc/Icon'
-import type { IconProp } from '@fortawesome/fontawesome-svg-core'
+import type {IconProp} from '@fortawesome/fontawesome-svg-core'
 
 export interface DropDownItemProps extends /* @vue-ignore */ BaseButtonProps {
 	icon?: IconProp,
+	iconClass?: object | string,
 }
 
 defineProps<DropDownItemProps>()
@@ -24,7 +29,6 @@ defineProps<DropDownItemProps>()
 <style scoped lang="scss">
 .dropdown-item {
 	color: var(--text);
-	display: block;
 	font-size: 0.875rem;
 	line-height: 1.5;
 	padding: $item-padding;
@@ -52,10 +56,7 @@ defineProps<DropDownItemProps>()
 
 .icon {
 	padding-right: .5rem;
-	
-	&:not(.has-text-success) {
-		color: var(--grey-300) !important;
-	}
+	color: var(--grey-300);
 }
 
 .has-text-danger .icon {
diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json
index e4d12b0bb..9a342e64f 100644
--- a/src/i18n/lang/en.json
+++ b/src/i18n/lang/en.json
@@ -334,6 +334,9 @@
       "doneBucketHint": "All tasks moved into this bucket will automatically marked as done.",
       "doneBucketHintExtended": "All tasks moved into the done bucket will be marked as done automatically. All tasks marked as done from elsewhere will be moved as well.",
       "doneBucketSavedSuccess": "The done bucket has been saved successfully.",
+      "defaultBucket": "Default bucket",
+      "defaultBucketHint": "When creating tasks without specifying a bucket, they will be added to this bucket.",
+      "defaultBucketSavedSuccess": "The default bucket has been saved successfully.",
       "deleteLast": "You cannot remove the last bucket.",
       "addTaskPlaceholder": "Enter the new task title…",
       "addTask": "Add a task",
diff --git a/src/modelTypes/IBucket.ts b/src/modelTypes/IBucket.ts
index 196628dcc..0f7ce12da 100644
--- a/src/modelTypes/IBucket.ts
+++ b/src/modelTypes/IBucket.ts
@@ -8,7 +8,6 @@ export interface IBucket extends IAbstract {
 	projectId: number
 	limit: number
 	tasks: ITask[]
-	isDoneBucket: boolean
 	position: number
 	count: number
 	
diff --git a/src/modelTypes/IProject.ts b/src/modelTypes/IProject.ts
index 20f46d6ae..f5c976f3a 100644
--- a/src/modelTypes/IProject.ts
+++ b/src/modelTypes/IProject.ts
@@ -19,6 +19,8 @@ export interface IProject extends IAbstract {
 	position: number
 	backgroundBlurHash: string
 	parentProjectId: number
+	doneBucketId: number
+	defaultBucketId: number
 	
 	created: Date
 	updated: Date
diff --git a/src/models/bucket.ts b/src/models/bucket.ts
index 183736d7e..68efad161 100644
--- a/src/models/bucket.ts
+++ b/src/models/bucket.ts
@@ -12,7 +12,6 @@ export default class BucketModel extends AbstractModel<IBucket> implements IBuck
 	projectId = ''
 	limit = 0
 	tasks: ITask[] = []
-	isDoneBucket = false
 	position = 0
 	count = 0
 	
diff --git a/src/models/project.ts b/src/models/project.ts
index 17da3d798..145262dc3 100644
--- a/src/models/project.ts
+++ b/src/models/project.ts
@@ -23,6 +23,8 @@ export default class ProjectModel extends AbstractModel<IProject> implements IPr
 	position = 0
 	backgroundBlurHash = ''
 	parentProjectId = 0
+	doneBucketId = 0
+	defaultBucketId = 0
 	
 	created: Date = null
 	updated: Date = null
diff --git a/src/views/project/ProjectKanban.vue b/src/views/project/ProjectKanban.vue
index ffb76d760..0af6e9c55 100644
--- a/src/views/project/ProjectKanban.vue
+++ b/src/views/project/ProjectKanban.vue
@@ -37,7 +37,7 @@
 					>
 						<div class="bucket-header" @click="() => unCollapseBucket(bucket)">
 							<span
-								v-if="bucket.isDoneBucket"
+								v-if="project.doneBucketId === bucket.id"
 								class="icon is-small has-text-success mr-2"
 								v-tooltip="$t('project.kanban.doneBucketHint')"
 							>
@@ -97,26 +97,32 @@
 								<dropdown-item
 									@click.stop="toggleDoneBucket(bucket)"
 									v-tooltip="$t('project.kanban.doneBucketHintExtended')"
+									:icon-class="{'has-text-success': bucket.id === project.doneBucketId}"
+									icon="check-double"
 								>
-									<span class="icon is-small" :class="{'has-text-success': bucket.isDoneBucket}">
-										<icon icon="check-double"/>
-									</span>
 									{{ $t('project.kanban.doneBucket') }}
 								</dropdown-item>
+								<dropdown-item
+									@click.stop="toggleDefaultBucket(bucket)"
+									v-tooltip="$t('project.kanban.defaultBucketHint')"
+									:icon-class="{'has-text-primary': bucket.id === project.defaultBucketId}"
+									icon="th"
+								>
+									{{ $t('project.kanban.defaultBucket') }}
+								</dropdown-item>
 								<dropdown-item
 									@click.stop="() => collapseBucket(bucket)"
+									icon="angles-up"
 								>
 									{{ $t('project.kanban.collapse') }}
 								</dropdown-item>
 								<dropdown-item
 									:class="{'is-disabled': buckets.length <= 1}"
 									@click.stop="() => deleteBucketModal(bucket.id)"
-									class="has-text-danger"
 									v-tooltip="buckets.length <= 1 ? $t('project.kanban.deleteLast') : ''"
+									icon-class="has-text-danger"
+									icon="trash-alt"
 								>
-									<span class="icon is-small">
-										<icon icon="trash-alt"/>
-									</span>
 									{{ $t('misc.delete') }}
 								</dropdown-item>
 							</dropdown>
@@ -251,6 +257,7 @@ import {calculateItemPosition} from '@/helpers/calculateItemPosition'
 
 import {isSavedFilter} from '@/services/savedFilter'
 import {success} from '@/message'
+import {useProjectStore} from '@/stores/projects'
 
 const DRAG_OPTIONS = {
 	// sortable options
@@ -268,6 +275,7 @@ const {t} = useI18n({useScope: 'global'})
 const baseStore = useBaseStore()
 const kanbanStore = useKanbanStore()
 const taskStore = useTaskStore()
+const projectStore = useProjectStore()
 
 const taskContainerRefs = ref<{[id: IBucket['id']]: HTMLElement}>({})
 
@@ -422,10 +430,9 @@ async function updateTaskPosition(e) {
 	)
 	if (
 		oldBucket !== undefined && // This shouldn't actually be `undefined`, but let's play it safe.
-		newBucket.id !== oldBucket.id &&
-		newBucket.isDoneBucket !== oldBucket.isDoneBucket
+		newBucket.id !== oldBucket.id
 	) {
-		newTask.done = newBucket.isDoneBucket
+		newTask.done = project.value.doneBucketId === newBucket.id
 	}
 	if (
 		oldBucket !== undefined && // This shouldn't actually be `undefined`, but let's play it safe.
@@ -596,10 +603,26 @@ function dragstart(bucket: IBucket) {
 	sourceBucket.value = bucket.id
 }
 
+async function toggleDefaultBucket(bucket: IBucket) {
+	const defaultBucketId = project.value.defaultBucketId === bucket.id
+		? 0
+		: bucket.id
+
+	await projectStore.updateProject({
+		...project.value,
+		defaultBucketId,
+	})
+	success({message: t('project.kanban.defaultBucketSavedSuccess')})
+}
+
 async function toggleDoneBucket(bucket: IBucket) {
-	await kanbanStore.updateBucket({
-		...bucket,
-		isDoneBucket: !bucket.isDoneBucket,
+	const doneBucketId = project.value.doneBucketId === bucket.id
+		? 0
+		: bucket.id
+	
+	await projectStore.updateProject({
+		...project.value,
+		doneBucketId,
 	})
 	success({message: t('project.kanban.doneBucketSavedSuccess')})
 }