diff --git a/src/components/home/navigation.vue b/src/components/home/navigation.vue
index dc09c5d72..07be48e08 100644
--- a/src/components/home/navigation.vue
+++ b/src/components/home/navigation.vue
@@ -56,10 +56,10 @@
 						class="menu-label"
 						v-tooltip="namespaceTitles[nk]"
 					>
-						<span
+						<ColorBubble
 							v-if="n.hexColor !== ''"
-							:style="{ backgroundColor: n.hexColor }"
-							class="color-bubble"
+							:color="n.hexColor"
+							class="mr-1"
 						/>
 						<span class="name">{{ namespaceTitles[nk] }}</span>
 						<div
@@ -114,11 +114,11 @@
 									<span class="icon handle">
 										<icon icon="grip-lines"/>
 									</span>
-									<span
-										:style="{ backgroundColor: l.hexColor }"
-										class="color-bubble"
-										v-if="l.hexColor !== ''">
-									</span>
+									<ColorBubble
+											v-if="l.hexColor !== ''"
+										:color="l.hexColor"
+										class="mr-1"
+									/>
 									<span class="list-menu-title">{{ getListTitle(l) }}</span>
 								</BaseButton>
 								<BaseButton
@@ -158,6 +158,7 @@ import {getListTitle} from '@/helpers/getListTitle'
 import {useEventListener} from '@vueuse/core'
 import type {IList} from '@/modelTypes/IList'
 import type {INamespace} from '@/modelTypes/INamespace'
+import ColorBubble from '@/components/misc/colorBubble.vue'
 
 const drag = ref(false)
 const dragOptions = {
diff --git a/src/components/input/button.vue b/src/components/input/button.vue
index 0131c287b..ae34391dc 100644
--- a/src/components/input/button.vue
+++ b/src/components/input/button.vue
@@ -9,9 +9,16 @@
 			}
 		]"
 	>
-		<icon :icon="icon" v-if="showIconOnly"/>
+		<icon 
+			v-if="showIconOnly"
+			:icon="icon"
+			:style="{'color': iconColor !== '' ? iconColor : false}"
+		/>
 		<span class="icon is-small" v-else-if="icon !== ''">
-			<icon :icon="icon"/>
+			<icon 
+				:icon="icon"
+				:style="{'color': iconColor !== '' ? iconColor : false}"
+			/>
 		</span>
 		<slot />
 	</BaseButton>
@@ -42,6 +49,10 @@ const props = defineProps({
 		type: [String, Array],
 		default: '',
 	},
+	iconColor: {
+		type: String,
+		default: '',
+	},
 	loading: {
 		type: Boolean,
 		default: false,
diff --git a/src/components/misc/colorBubble.vue b/src/components/misc/colorBubble.vue
new file mode 100644
index 000000000..1b1f037d0
--- /dev/null
+++ b/src/components/misc/colorBubble.vue
@@ -0,0 +1,24 @@
+<template>
+	<span
+		:style="{backgroundColor: color }"
+		class="color-bubble"
+	></span>
+</template>
+
+<script lang="ts" setup>
+import type { Color } from 'csstype'
+
+defineProps< {
+	color: Color,
+}>()
+</script>
+
+<style scoped>
+.color-bubble {
+	display: inline-block;
+	border-radius: 100%;
+	height: 10px;
+	width: 10px;
+	flex-shrink: 0;
+}
+</style>
\ No newline at end of file
diff --git a/src/components/tasks/partials/heading.vue b/src/components/tasks/partials/heading.vue
index 9b57c2ad6..b8bc51cf6 100644
--- a/src/components/tasks/partials/heading.vue
+++ b/src/components/tasks/partials/heading.vue
@@ -1,7 +1,12 @@
 <template>
 	<div class="heading">
 		<BaseButton @click="copyUrl"><h1 class="title task-id">{{ textIdentifier }}</h1></BaseButton>
-		<Done class="heading__done" :is-done="task.done" />
+		<Done class="heading__done" :is-done="task.done"/>
+		<ColorBubble
+			v-if="task.hexColor !== ''"
+			:color="task.getHexColor()"
+			class="mt-1 ml-2"
+		/>
 		<h1
 			class="title input"
 			:class="{'disabled': !canWrite}"
@@ -42,6 +47,7 @@ import Done from '@/components/misc/Done.vue'
 import {useCopyToClipboard} from '@/composables/useCopyToClipboard'
 
 import type {ITask} from '@/modelTypes/ITask'
+import ColorBubble from '@/components/misc/colorBubble.vue'
 
 const props = defineProps({
 	task: {
@@ -58,10 +64,11 @@ const emit = defineEmits(['update:task'])
 
 const router = useRouter()
 const copy = useCopyToClipboard()
+
 async function copyUrl() {
-	const route = router.resolve({ name: 'task.detail', query: { taskId: props.task.id}})
+	const route = router.resolve({name: 'task.detail', query: {taskId: props.task.id}})
 	const absoluteURL = new URL(route.href, window.location.href).href
-	
+
 	await copy(absoluteURL)
 }
 
@@ -95,8 +102,7 @@ async function save(title: string) {
 		setTimeout(() => {
 			showSavedMessage.value = false
 		}, 2000)
-	}
-	finally {
+	} finally {
 		saving.value = false
 	}
 }
@@ -106,4 +112,9 @@ async function save(title: string) {
 .heading__done {
 	margin-left: .5rem;
 }
+
+.color-bubble {
+	height: .75rem;
+	width: .75rem;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/tasks/partials/singleTaskInList.vue b/src/components/tasks/partials/singleTaskInList.vue
index 2794de163..6fef7fa77 100644
--- a/src/components/tasks/partials/singleTaskInList.vue
+++ b/src/components/tasks/partials/singleTaskInList.vue
@@ -1,12 +1,11 @@
 <template>
 	<div :class="{'is-loading': taskService.loading}" class="task loader-container">
 		<fancycheckbox :disabled="(isArchived || disabled) && !canMarkAsDone" @change="markAsDone" v-model="task.done"/>
-		<span
+		<ColorBubble
 			v-if="showListColor && listColor !== ''"
-			:style="{backgroundColor: listColor }"
-			class="color-bubble"
-		>
-		</span>
+			:color="listColor"
+			class="mr-1"
+		/>
 		<router-link
 			:to="taskDetailRoute"
 			:class="{ 'done': task.done}"
@@ -15,11 +14,17 @@
 				<router-link
 					:to="{ name: 'list.list', params: { listId: task.listId } }"
 					class="task-list"
+					:class="{'mr-2': task.hexColor !== ''}"
 					v-if="showList && $store.getters['lists/getListById'](task.listId) !== null"
 					v-tooltip="$t('task.detail.belongsToList', {list: $store.getters['lists/getListById'](task.listId).title})">
 					{{ $store.getters['lists/getListById'](task.listId).title }}
 				</router-link>
 
+				<ColorBubble
+					v-if="task.hexColor !== ''"
+					:color="task.getHexColor()"
+					class="mr-1"
+				/>
 				<!-- Show any parent tasks to make it clear this task is a sub task of something -->
 				<span class="parent-tasks" v-if="typeof task.relatedTasks.parenttask !== 'undefined'">
 					<template v-for="(pt, i) in task.relatedTasks.parenttask">
@@ -30,7 +35,7 @@
 				{{ task.title }}
 			</span>
 
-			<labels class="labels ml-2 mr-1" :labels="task.labels" v-if="task.labels.length > 0" />
+			<labels class="labels ml-2 mr-1" :labels="task.labels" v-if="task.labels.length > 0"/>
 			<user
 				:avatar-size="27"
 				:is-inline="true"
@@ -111,6 +116,7 @@ import {closeWhenClickedOutside} from '@/helpers/closeWhenClickedOutside'
 import {playPop} from '@/helpers/playPop'
 import ChecklistSummary from './checklist-summary.vue'
 import {formatDateSince, formatISO, formatDateLong} from '@/helpers/time/formatDate'
+import ColorBubble from '@/components/misc/colorBubble.vue'
 
 export default defineComponent({
 	name: 'singleTaskInList',
@@ -122,6 +128,7 @@ export default defineComponent({
 		}
 	},
 	components: {
+		ColorBubble,
 		BaseButton,
 		ChecklistSummary,
 		DeferTask,
@@ -282,11 +289,6 @@ export default defineComponent({
 		white-space: nowrap;
 	}
 
-	.color-bubble {
-		height: 10px;
-		flex: 0 0 10px;
-	}
-
 	.avatar {
 		border-radius: 50%;
 		vertical-align: bottom;
diff --git a/src/views/tasks/TaskDetailView.vue b/src/views/tasks/TaskDetailView.vue
index a584aeb63..b75e73257 100644
--- a/src/views/tasks/TaskDetailView.vue
+++ b/src/views/tasks/TaskDetailView.vue
@@ -378,6 +378,7 @@
 							@click="setFieldActive('color')"
 							variant="secondary"
 							icon="fill-drip"
+							:icon-color="color"
 							v-shortcut="'c'"
 						>
 							{{ $t('task.detail.actions.color') }}
@@ -429,7 +430,7 @@ import {defineComponent} from 'vue'
 import cloneDeep from 'lodash.clonedeep'
 
 import TaskService from '../../services/task'
-import TaskModel from '@/models/task'
+import TaskModel, {TASK_DEFAULT_COLOR} from '@/models/task'
 import type {ITask} from '@/modelTypes/ITask'
 
 import { PRIORITIES as priorites } from '@/constants/priorities'
@@ -461,6 +462,7 @@ import { setTitle } from '@/helpers/setTitle'
 import {getNamespaceTitle} from '@/helpers/getNamespaceTitle'
 import {getListTitle} from '@/helpers/getListTitle'
 import type { IList } from '@/modelTypes/IList'
+import {colorIsDark} from '@/helpers/color/colorIsDark'
 
 function scrollIntoView(el) {
 	if (!el) {
@@ -527,6 +529,8 @@ export default defineComponent({
 			showDeleteModal: false,
 			// Used to avoid flashing of empty elements if the task content is not yet loaded.
 			visible: false,
+			
+			TASK_DEFAULT_COLOR,
 
 			activeFields: {
 				assignees: false,
@@ -594,6 +598,15 @@ export default defineComponent({
 		shouldShowClosePopup() {
 			return this.$route.name.includes('kanban')
 		},
+		color() {
+			const color = this.task.getHexColor
+				? this.task.getHexColor()
+				: false
+			
+			return color === TASK_DEFAULT_COLOR
+				? ''
+				: color
+		},
 	},
 	methods: {
 		getNamespaceTitle,
@@ -745,6 +758,8 @@ export default defineComponent({
 			this.task = await this.taskService.update(this.task)
 			this.$store.dispatch('namespaces/loadNamespacesIfFavoritesDontExist')
 		},
+		
+		colorIsDark,
 	},
 })
 </script>
@@ -932,7 +947,11 @@ $flash-background-duration: 750ms;
     .button {
       width: 100%;
       margin-bottom: .5rem;
-      justify-content: left;
+      justify-content: left; 
+
+      &.has-light-text {
+		color: var(--white);
+      }
     }
   }