diff --git a/localization/strings.pot b/localization/strings.pot
index afe3e2cf..884fac3a 100644
--- a/localization/strings.pot
+++ b/localization/strings.pot
@@ -826,7 +826,7 @@ msgstr ""
 msgid "Use a specific stock item"
 msgstr ""
 
-msgid "The first item in this list would be picked by the default rule which is \"Opened first, then first due first, then first in first out\""
+msgid "The first item in this list would be picked by the default rule consume rule (Opened first, then first due first, then first in first out)"
 msgstr ""
 
 msgid "Mark %1$s of %2$s as open"
diff --git a/public/js/grocy.js b/public/js/grocy.js
index 49fcc149..4bdafe7d 100644
--- a/public/js/grocy.js
+++ b/public/js/grocy.js
@@ -1186,3 +1186,11 @@ $('[data-toggle="tooltip"][data-html="true"]').on("shown.bs.tooltip", function()
 {
 	RefreshLocaleNumberDisplay(".tooltip");
 })
+
+$(document).on("click", "#clear-filter-button", function(e)
+{
+	// Remove the focus from the current button
+	// to prevent that the tooltip stays until clicked anywhere else
+	document.activeElement.blur();
+	console.log("x")
+});
diff --git a/views/batteries.blade.php b/views/batteries.blade.php
index 176f8158..a62cf27e 100644
--- a/views/batteries.blade.php
+++ b/views/batteries.blade.php
@@ -68,8 +68,10 @@
 		<div class="float-right">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/batteriesjournal.blade.php b/views/batteriesjournal.blade.php
index 5ec52abc..8a297d70 100644
--- a/views/batteriesjournal.blade.php
+++ b/views/batteriesjournal.blade.php
@@ -13,7 +13,7 @@
 				type="button"
 				data-toggle="collapse"
 				data-target="#table-filter-row">
-				<i class="fa-solid fa-filter"></i>
+				<i class="fas fa-filter"></i>
 			</button>
 		</div>
 	</div>
@@ -26,7 +26,7 @@
 	<div class="col-12 col-md-6 col-xl-3">
 		<div class="input-group">
 			<div class="input-group-prepend">
-				<span class="input-group-text"><i class="fa-solid fa-search"></i></span>
+				<span class="input-group-text"><i class="fas fa-search"></i></span>
 			</div>
 			<input type="text"
 				id="search"
@@ -37,7 +37,7 @@
 	<div class="col-12 col-md-6 col-xl-3">
 		<div class="input-group">
 			<div class="input-group-prepend">
-				<span class="input-group-text"><i class="fa-solid fa-filter"></i>&nbsp;{{ $__t('Battery') }}</span>
+				<span class="input-group-text"><i class="fas fa-filter"></i>&nbsp;{{ $__t('Battery') }}</span>
 			</div>
 			<select class="custom-control custom-select"
 				id="battery-filter">
@@ -51,7 +51,7 @@
 	<div class="col-12 col-md-6 col-xl-3">
 		<div class="input-group">
 			<div class="input-group-prepend">
-				<span class="input-group-text"><i class="fa-solid fa-clock"></i>&nbsp;{{ $__t('Date range') }}</span>
+				<span class="input-group-text"><i class="fas fa-clock"></i>&nbsp;{{ $__t('Date range') }}</span>
 			</div>
 			<select class="custom-control custom-select"
 				id="daterange-filter">
@@ -68,8 +68,10 @@
 		<div class="float-right">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
@@ -86,7 +88,7 @@
 							data-toggle="tooltip"
 							title="{{ $__t('Table options') }}"
 							data-table-selector="#batteries-journal-table"
-							href="#"><i class="fa-solid fa-eye"></i></a>
+							href="#"><i class="fas fa-eye"></i></a>
 					</th>
 					<th class="allow-grouping">{{ $__t('Battery') }}</th>
 					<th>{{ $__t('Tracked time') }}</th>
@@ -103,7 +105,7 @@
 							data-toggle="tooltip"
 							data-placement="left"
 							title="{{ $__t('Undo charge cycle') }}">
-							<i class="fa-solid fa-undo"></i>
+							<i class="fas fa-undo"></i>
 						</a>
 					</td>
 					<td>
diff --git a/views/batteriesoverview.blade.php b/views/batteriesoverview.blade.php
index f8ba942b..97b548ef 100644
--- a/views/batteriesoverview.blade.php
+++ b/views/batteriesoverview.blade.php
@@ -39,17 +39,19 @@
 				data-status-filter="duesoon"
 				data-next-x-days="{{ $nextXDays }}"
 				class="warning-message status-filter-message responsive-button @if($nextXDays == 0) d-none @endif"></div>
-			<div class="float-right">
-				<a class="btn btn-sm btn-outline-info d-md-none mt-1"
+			<div class="float-right mt-1">
+				<a class="btn btn-sm btn-outline-info d-md-none"
 					data-toggle="collapse"
 					href="#table-filter-row"
 					role="button">
 					<i class="fa-solid fa-filter"></i>
 				</a>
 				<a id="clear-filter-button"
-					class="btn btn-sm btn-outline-info mt-1"
-					href="#">
-					{{ $__t('Clear filter') }}
+					class="btn btn-sm btn-outline-info"
+					href="#"
+					data-toggle="tooltip"
+					title="{{ $__t('Clear filter') }}">
+					<i class="fa-solid fa-filter-circle-xmark"></i>
 				</a>
 			</div>
 		</div>
diff --git a/views/chores.blade.php b/views/chores.blade.php
index ec60bec9..7d9cc313 100644
--- a/views/chores.blade.php
+++ b/views/chores.blade.php
@@ -68,8 +68,10 @@
 		<div class="float-right">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/choresjournal.blade.php b/views/choresjournal.blade.php
index aa49d6c7..3440af00 100644
--- a/views/choresjournal.blade.php
+++ b/views/choresjournal.blade.php
@@ -68,8 +68,10 @@
 		<div class="float-right">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/choresoverview.blade.php b/views/choresoverview.blade.php
index ae7b87e6..7e492a08 100644
--- a/views/choresoverview.blade.php
+++ b/views/choresoverview.blade.php
@@ -44,17 +44,19 @@
 				data-user-filter="xx{{ GROCY_USER_ID }}xx"
 				class="secondary-message user-filter-message responsive-button"></div>
 			@endif
-			<div class="float-right">
-				<a class="btn btn-sm btn-outline-info d-md-none mt-1"
+			<div class="float-right mt-1">
+				<a class="btn btn-sm btn-outline-info d-md-none"
 					data-toggle="collapse"
 					href="#table-filter-row"
 					role="button">
 					<i class="fa-solid fa-filter"></i>
 				</a>
 				<a id="clear-filter-button"
-					class="btn btn-sm btn-outline-info mt-1"
-					href="#">
-					{{ $__t('Clear filter') }}
+					class="btn btn-sm btn-outline-info"
+					href="#"
+					data-toggle="tooltip"
+					title="{{ $__t('Clear filter') }}">
+					<i class="fa-solid fa-filter-circle-xmark"></i>
 				</a>
 			</div>
 		</div>
diff --git a/views/consume.blade.php b/views/consume.blade.php
index 011613ab..faf84681 100644
--- a/views/consume.blade.php
+++ b/views/consume.blade.php
@@ -118,19 +118,7 @@
 						&nbsp;<i class="fa-solid fa-question-circle text-muted"
 							data-toggle="tooltip"
 							data-trigger="hover click"
-							title="{{ $__t('The first item in this list would be picked by the default rule which is "
-							Opened
-							first,
-							then
-							first
-							due
-							first,
-							then
-							first
-							in
-							first
-							out"')
-							}}"></i>
+							title="{{ $__t('The first item in this list would be picked by the default rule consume rule (Opened first, then first due first, then first in first out)') }}"></i>
 					</label>
 				</div>
 				<select disabled
diff --git a/views/equipment.blade.php b/views/equipment.blade.php
index 992e01b7..72aed5ef 100644
--- a/views/equipment.blade.php
+++ b/views/equipment.blade.php
@@ -49,8 +49,10 @@
 				<div class="float-right">
 					<a id="clear-filter-button"
 						class="btn btn-sm btn-outline-info"
-						href="#">
-						{{ $__t('Clear filter') }}
+						href="#"
+						data-toggle="tooltip"
+						title="{{ $__t('Clear filter') }}">
+						<i class="fa-solid fa-filter-circle-xmark"></i>
 					</a>
 				</div>
 			</div>
diff --git a/views/locations.blade.php b/views/locations.blade.php
index c47aee61..53585fc1 100644
--- a/views/locations.blade.php
+++ b/views/locations.blade.php
@@ -57,8 +57,10 @@
 		<div class="float-right">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/manageapikeys.blade.php b/views/manageapikeys.blade.php
index 6ddbf02d..2a7fb825 100644
--- a/views/manageapikeys.blade.php
+++ b/views/manageapikeys.blade.php
@@ -62,8 +62,10 @@
 		<div class="float-right">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/mealplansections.blade.php b/views/mealplansections.blade.php
index 2c4f8211..8abcf632 100644
--- a/views/mealplansections.blade.php
+++ b/views/mealplansections.blade.php
@@ -53,8 +53,10 @@
 		<div class="float-right">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/productgroups.blade.php b/views/productgroups.blade.php
index a60e7f4d..bd45725f 100644
--- a/views/productgroups.blade.php
+++ b/views/productgroups.blade.php
@@ -57,8 +57,10 @@
 		<div class="float-right">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/products.blade.php b/views/products.blade.php
index d439c13c..facb36b5 100644
--- a/views/products.blade.php
+++ b/views/products.blade.php
@@ -97,8 +97,10 @@
 		<div class="float-right">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/quantityunits.blade.php b/views/quantityunits.blade.php
index 867d3aa9..1d0b70f2 100644
--- a/views/quantityunits.blade.php
+++ b/views/quantityunits.blade.php
@@ -57,8 +57,10 @@
 		<div class="float-right">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/recipeform.blade.php b/views/recipeform.blade.php
index ae3a1b6b..7a44c6b3 100644
--- a/views/recipeform.blade.php
+++ b/views/recipeform.blade.php
@@ -73,39 +73,7 @@
 						<i class="fa-solid fa-question-circle text-muted"
 							data-toggle="tooltip"
 							data-trigger="hover click"
-							title="{{ $__t('By default the amount to be added to the shopping list is "
-							needed
-							amount
-							-
-							stock
-							amount
-							-
-							shopping
-							list
-							amount"
-							-
-							when
-							this
-							is
-							enabled,
-							it
-							is
-							only
-							checked
-							against
-							the
-							stock
-							amount,
-							not
-							against
-							what
-							is
-							already
-							on
-							the
-							shopping
-							list')
-							}}"></i>
+							title="{{ $__t('By default the amount to be added to the shopping list is \"needed amount - stock amount - shopping list amount\" - when this is enabled, it is only checked against the stock amount, not against what is already on the shopping list') }}"></i>
 					</label>
 				</div>
 			</div>
diff --git a/views/recipes.blade.php b/views/recipes.blade.php
index cb6c2a5d..57bed123 100644
--- a/views/recipes.blade.php
+++ b/views/recipes.blade.php
@@ -80,8 +80,10 @@
 				<div class="float-right mt-1">
 					<a id="clear-filter-button"
 						class="btn btn-sm btn-outline-info"
-						href="#">
-						{{ $__t('Clear filter') }}
+						href="#"
+						data-toggle="tooltip"
+						title="{{ $__t('Clear filter') }}">
+						<i class="fa-solid fa-filter-circle-xmark"></i>
 					</a>
 				</div>
 			</div>
diff --git a/views/shoppinglist.blade.php b/views/shoppinglist.blade.php
index d62bae48..86578da9 100644
--- a/views/shoppinglist.blade.php
+++ b/views/shoppinglist.blade.php
@@ -149,8 +149,10 @@
 		<div class="float-right">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/shoppinglocations.blade.php b/views/shoppinglocations.blade.php
index 18d7cd6d..bac23d06 100644
--- a/views/shoppinglocations.blade.php
+++ b/views/shoppinglocations.blade.php
@@ -57,8 +57,10 @@
 		<div class="float-right">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/stockentries.blade.php b/views/stockentries.blade.php
index 51281550..e48b8581 100644
--- a/views/stockentries.blade.php
+++ b/views/stockentries.blade.php
@@ -59,8 +59,10 @@
 		<div class="float-right mt-3">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/stockjournal.blade.php b/views/stockjournal.blade.php
index ee56456d..bd4798d4 100644
--- a/views/stockjournal.blade.php
+++ b/views/stockjournal.blade.php
@@ -123,8 +123,10 @@
 		<div class="float-right mt-1">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/stockjournalsummary.blade.php b/views/stockjournalsummary.blade.php
index 5df7df13..aa48239b 100644
--- a/views/stockjournalsummary.blade.php
+++ b/views/stockjournalsummary.blade.php
@@ -80,8 +80,10 @@
 		<div class="float-right mt-1">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/stockoverview.blade.php b/views/stockoverview.blade.php
index fcb3d293..5caa887e 100755
--- a/views/stockoverview.blade.php
+++ b/views/stockoverview.blade.php
@@ -64,17 +64,19 @@
 			<div id="info-missing-products"
 				data-status-filter="belowminstockamount"
 				class="normal-message status-filter-message responsive-button"></div>
-			<div class="float-right">
-				<a class="btn btn-sm btn-outline-info d-md-none mt-1"
+			<div class="float-right mt-1">
+				<a class="btn btn-sm btn-outline-info d-md-none"
 					data-toggle="collapse"
 					href="#table-filter-row"
 					role="button">
 					<i class="fa-solid fa-filter"></i>
 				</a>
 				<a id="clear-filter-button"
-					class="btn btn-sm btn-outline-info mt-1"
-					href="#">
-					{{ $__t('Clear filter') }}
+					class="btn btn-sm btn-outline-info"
+					href="#"
+					data-toggle="tooltip"
+					title="{{ $__t('Clear filter') }}">
+					<i class="fa-solid fa-filter-circle-xmark"></i>
 				</a>
 			</div>
 		</div>
diff --git a/views/taskcategories.blade.php b/views/taskcategories.blade.php
index 7ba51421..38d01116 100644
--- a/views/taskcategories.blade.php
+++ b/views/taskcategories.blade.php
@@ -57,8 +57,10 @@
 		<div class="float-right">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/tasks.blade.php b/views/tasks.blade.php
index e79003c3..42b9da3e 100644
--- a/views/tasks.blade.php
+++ b/views/tasks.blade.php
@@ -39,17 +39,19 @@
 				data-status-filter="duesoon"
 				data-next-x-days="{{ $nextXDays }}"
 				class="warning-message status-filter-message responsive-button @if($nextXDays == 0) d-none @endif"></div>
-			<div class="float-right">
-				<a class="btn btn-sm btn-outline-info d-md-none mt-1"
+			<div class="float-right mt-1">
+				<a class="btn btn-sm btn-outline-info d-md-none"
 					data-toggle="collapse"
 					href="#table-filter-row"
 					role="button">
 					<i class="fa-solid fa-filter"></i>
 				</a>
 				<a id="clear-filter-button"
-					class="btn btn-sm btn-outline-info mt-1"
-					href="#">
-					{{ $__t('Clear filter') }}
+					class="btn btn-sm btn-outline-info"
+					href="#"
+					data-toggle="tooltip"
+					title="{{ $__t('Clear filter') }}">
+					<i class="fa-solid fa-filter-circle-xmark"></i>
 				</a>
 			</div>
 		</div>
diff --git a/views/transfer.blade.php b/views/transfer.blade.php
index 885e657f..25f76e6e 100644
--- a/views/transfer.blade.php
+++ b/views/transfer.blade.php
@@ -74,19 +74,7 @@
 						&nbsp;<i class="fa-solid fa-question-circle text-muted"
 							data-toggle="tooltip"
 							data-trigger="hover click"
-							title="{{ $__t('The first item in this list would be picked by the default rule which is "
-							Opened
-							first,
-							then
-							first
-							due
-							first,
-							then
-							first
-							in
-							first
-							out"')
-							}}"></i>
+							title="{{ $__t('The first item in this list would be picked by the default rule consume rule (Opened first, then first due first, then first in first out)') }}"></i>
 					</label>
 				</div>
 				<select disabled
diff --git a/views/userentities.blade.php b/views/userentities.blade.php
index 2547fb4c..4e83a51f 100644
--- a/views/userentities.blade.php
+++ b/views/userentities.blade.php
@@ -53,8 +53,10 @@
 		<div class="float-right">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/userfields.blade.php b/views/userfields.blade.php
index a106fcfe..40f86f3d 100644
--- a/views/userfields.blade.php
+++ b/views/userfields.blade.php
@@ -68,8 +68,10 @@
 		<div class="float-right">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/userobjects.blade.php b/views/userobjects.blade.php
index 5e0632b8..1d705446 100644
--- a/views/userobjects.blade.php
+++ b/views/userobjects.blade.php
@@ -62,8 +62,10 @@
 		<div class="float-right">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>
diff --git a/views/users.blade.php b/views/users.blade.php
index dc151494..e0793dfb 100644
--- a/views/users.blade.php
+++ b/views/users.blade.php
@@ -57,8 +57,10 @@
 		<div class="float-right">
 			<a id="clear-filter-button"
 				class="btn btn-sm btn-outline-info"
-				href="#">
-				{{ $__t('Clear filter') }}
+				href="#"
+				data-toggle="tooltip"
+				title="{{ $__t('Clear filter') }}">
+				<i class="fa-solid fa-filter-circle-xmark"></i>
 			</a>
 		</div>
 	</div>