diff --git a/frontend/src/components/tasks/partials/Labels.vue b/frontend/src/components/tasks/partials/Labels.vue
index 86c3629d7..55332c233 100644
--- a/frontend/src/components/tasks/partials/Labels.vue
+++ b/frontend/src/components/tasks/partials/Labels.vue
@@ -4,7 +4,6 @@
 			v-for="label in displayLabels"
 			:key="label.id"
 			:label="label"
-			:clickable="true"
 		/>
 	</div>
 </template>
diff --git a/frontend/src/i18n/lang/en.json b/frontend/src/i18n/lang/en.json
index 32422963b..c9ce670ca 100644
--- a/frontend/src/i18n/lang/en.json
+++ b/frontend/src/i18n/lang/en.json
@@ -808,7 +808,7 @@
       "fromuntil": "Tasks from {from} until {until}",
       "select": "Select a date range",
       "noTasks": "Nothing to do — Have a nice day!",
-      "filterByLabel": "Filtering by label: {label}"
+      "filterByLabel": "Filtering by label {label}"
     },
     "detail": {
       "chooseDueDate": "Click here to set a due date",
diff --git a/frontend/src/views/labels/ListLabels.vue b/frontend/src/views/labels/ListLabels.vue
index 9a5cdbb63..af730f063 100644
--- a/frontend/src/views/labels/ListLabels.vue
+++ b/frontend/src/views/labels/ListLabels.vue
@@ -33,21 +33,19 @@
 					v-for="label in labelStore.labelsArray"
 					:key="label.id"
 					:class="{'disabled': userInfo.id !== label.createdBy.id}"
-					:style="getLabelStyles(label)"
-					class="tag"
+					class="label-item"
 				>
-					<span
-						v-if="userInfo.id !== label.createdBy.id"
-						v-tooltip.bottom="$t('label.edit.forbidden')"
-					>
-						{{ label.title }}
-					</span>
+					<XLabel
+						:label="label"
+						:clickable="true"
+					/>
 					<BaseButton
-						v-else
+						v-if="userInfo.id === label.createdBy.id"
+						class="edit-button"
 						:style="{'color': label.textColor}"
 						@click="editLabel(label)"
 					>
-						{{ label.title }}
+						<Icon icon="pen" />
 					</BaseButton>
 					<BaseButton
 						v-if="userInfo.id === label.createdBy.id"
@@ -142,6 +140,8 @@ import {useI18n} from 'vue-i18n'
 import BaseButton from '@/components/base/BaseButton.vue'
 import Editor from '@/components/input/AsyncEditor'
 import ColorPicker from '@/components/input/ColorPicker.vue'
+import XLabel from '@/components/tasks/partials/Label.vue'
+import Icon from '@/components/misc/Icon'
 
 import LabelModel from '@/models/label'
 import type {ILabel} from '@/modelTypes/ILabel'
@@ -212,3 +212,27 @@ function showDeleteDialoge(label: ILabel) {
 	showDeleteModal.value = true
 }
 </script>
+
+<style lang="scss" scoped>
+.label-item {
+	display: inline-flex;
+	align-items: center;
+	gap: 0.25rem;
+	margin: 0.25rem;
+	
+	&.disabled {
+		opacity: 0.6;
+	}
+	
+	.edit-button {
+		padding: 0.25rem 0.5rem;
+		background: transparent;
+		border: none;
+		cursor: pointer;
+		
+		&:hover {
+			opacity: 0.8;
+		}
+	}
+}
+</style>
diff --git a/frontend/src/views/tasks/ShowTasks.vue b/frontend/src/views/tasks/ShowTasks.vue
index 64019bec1..021c200d6 100644
--- a/frontend/src/views/tasks/ShowTasks.vue
+++ b/frontend/src/views/tasks/ShowTasks.vue
@@ -101,7 +101,7 @@ import {formatDate} from '@/helpers/time/formatDate'
 import {setTitle} from '@/helpers/setTitle'
 
 import BaseButton from '@/components/base/BaseButton.vue'
-import Icon from '@/components/misc/Icon.vue'
+import Icon from '@/components/misc/Icon'
 import FancyCheckbox from '@/components/input/FancyCheckbox.vue'
 import SingleTaskInProject from '@/components/tasks/partials/SingleTaskInProject.vue'
 import DatepickerWithRange from '@/components/date/DatepickerWithRange.vue'