diff --git a/frontend/src/i18n/lang/en.json b/frontend/src/i18n/lang/en.json
index c9ce670ca..711d50778 100644
--- a/frontend/src/i18n/lang/en.json
+++ b/frontend/src/i18n/lang/en.json
@@ -808,7 +808,8 @@
       "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}",
+      "clearLabelFilter": "Clear label filter"
     },
     "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 af730f063..b1a9e9752 100644
--- a/frontend/src/views/labels/ListLabels.vue
+++ b/frontend/src/views/labels/ListLabels.vue
@@ -39,18 +39,10 @@
 						:label="label"
 						:clickable="true"
 					/>
-					<BaseButton
-						v-if="userInfo.id === label.createdBy.id"
-						class="edit-button"
-						:style="{'color': label.textColor}"
-						@click="editLabel(label)"
-					>
-						<Icon icon="pen" />
-					</BaseButton>
 					<BaseButton
 						v-if="userInfo.id === label.createdBy.id"
 						class="delete is-small"
-						@click="showDeleteDialoge(label)"
+						@click="editLabel(label)"
 					/>
 				</span>
 			</div>
@@ -141,7 +133,6 @@ 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'
@@ -149,7 +140,6 @@ import {useAuthStore} from '@/stores/auth'
 import {useLabelStore} from '@/stores/labels'
 
 import { useTitle } from '@/composables/useTitle'
-import {useLabelStyles} from '@/composables/useLabelStyles'
 
 const {t} = useI18n({useScope: 'global'})
 
@@ -168,7 +158,6 @@ const labelStore = useLabelStore()
 labelStore.loadAllLabels()
 
 const loading = computed(() => labelStore.isLoading)
-const {getLabelStyles} = useLabelStyles()
 
 function deleteLabel(label?: ILabel) {
 	if (!label) {
@@ -223,16 +212,5 @@ function showDeleteDialoge(label: ILabel) {
 	&.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 021c200d6..d4387bd44 100644
--- a/frontend/src/views/tasks/ShowTasks.vue
+++ b/frontend/src/views/tasks/ShowTasks.vue
@@ -24,6 +24,7 @@
 				</template>
 			</i18n-t>
 			<BaseButton
+				v-tooltip="$t('task.show.clearLabelFilter')"
 				class="clear-filter-button"
 				@click="clearLabelFilter"
 			>
@@ -307,7 +308,6 @@ watchEffect(() => setTitle(pageTitle.value))
 	border-radius: $radius;
 	
 	.filter-label-text {
-		font-weight: 600;
 		color: var(--grey-700);
 	}