diff --git a/localization/strings.pot b/localization/strings.pot
index 3292c1bd..8664ed79 100644
--- a/localization/strings.pot
+++ b/localization/strings.pot
@@ -1789,3 +1789,9 @@ msgstr ""
 
 msgid "Show an icon if the product is already on the shopping list"
 msgstr ""
+
+msgid "Calories"
+msgstr ""
+
+msgid "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"
+msgstr ""
diff --git a/public/css/grocy.css b/public/css/grocy.css
index 3ddb9d27..90652da6 100644
--- a/public/css/grocy.css
+++ b/public/css/grocy.css
@@ -488,11 +488,16 @@ canvas.drawingBuffer {
   flex-wrap: wrap;
 }
 
-.custom-control-label {
+.form-control-lg .custom-control-label {
   padding-top: 7px;
   padding-left: 10px;
 }
 
+.custom-control-label {
+  padding-top: 13px;
+  padding-left: 10px;
+}
+
 .custom-control-label::before,
 .custom-control-label::after {
   top: 0.8rem;
diff --git a/views/components/numberpicker.blade.php b/views/components/numberpicker.blade.php
index d74e80af..623e0103 100644
--- a/views/components/numberpicker.blade.php
+++ b/views/components/numberpicker.blade.php
@@ -17,7 +17,9 @@
 @php if(!isset($noNameAttribute)) { $noNameAttribute = false; } @endphp
 
 <div class="form-group {{ $additionalGroupCssClasses }}">
-	<label for="{{ $id }}">{{ $__t($label) }}&nbsp;&nbsp;<span id="{{ $hintId }}" class="small text-muted">{{ $hint }}</span>{!! $additionalHtmlContextHelp !!}</label>
+	<label for="{{ $id }}">
+		{{ $__t($label) }}&nbsp;
+		<i class="fas fa-question-circle" id="{{ $hintId }}" data-toggle="tooltip" title="{{ $hint }}"></i>{!! $additionalHtmlContextHelp !!}</label>
 	<div class="input-group">
 		<input {!! $additionalAttributes !!} type="number" class="form-control numberpicker {{ $additionalCssClasses }}" id="{{ $id }}" @if(!$noNameAttribute) name="{{ $id }}" @endif value="{{ $value }}" min="{{ $min }}" max="{{ $max }}" step="{{ $step }}" @if($isRequired) required @endif>
 		<div class="input-group-append">
diff --git a/views/components/productpicker.blade.php b/views/components/productpicker.blade.php
index 4cf715e0..99998514 100644
--- a/views/components/productpicker.blade.php
+++ b/views/components/productpicker.blade.php
@@ -13,7 +13,11 @@
 @php if(empty($nextInputSelector)) { $nextInputSelector = ''; } @endphp
 
 <div class="form-group" data-next-input-selector="{{ $nextInputSelector }}" data-disallow-add-product-workflows="{{ BoolToString($disallowAddProductWorkflows) }}" data-disallow-all-product-workflows="{{ BoolToString($disallowAllProductWorkflows) }}" data-prefill-by-name="{{ $prefillByName }}" data-prefill-by-id="{{ $prefillById }}">
-	<label for="product_id">{{ $__t($label) }} <i class="fas fa-barcode"></i><span id="barcode-lookup-disabled-hint" class="small text-muted d-none"> {{ $__t('Barcode lookup is disabled') }}</span>&nbsp;&nbsp;<span class="small text-muted">{{ $hint }}</span></label>
+	<label for="product_id">
+		{{ $__t($label) }}&nbsp;<i class="fas fa-barcode"></i>&nbsp;
+		<span id="barcode-lookup-disabled-hint" class="small text-muted d-none"> {{ $__t('Barcode lookup is disabled') }}</span>&nbsp;
+		<i class="fas fa-question-circle" data-toggle="tooltip" title="{{ $hint }}"></i>
+	</label>
 	<select class="form-control product-combobox barcodescanner-input" id="product_id" name="product_id" @if($isRequired) required @endif @if($disabled) disabled @endif data-target="@productpicker">
 		<option value=""></option>
 		@foreach($products as $product)
diff --git a/views/recipeform.blade.php b/views/recipeform.blade.php
index f9b8d63b..b4ad48a4 100644
--- a/views/recipeform.blade.php
+++ b/views/recipeform.blade.php
@@ -79,14 +79,15 @@
 			))			
 
 			<div class="form-group">
-				<div class="form-check custom-control custom-checkbox pt-0">
+				<div class="custom-control custom-checkbox">
 					<input type="hidden" name="not_check_shoppinglist" value="0">
 					<input @if($mode == 'edit' && $recipe->not_check_shoppinglist == 1) checked @endif class="form-check-input custom-control-input" type="checkbox" id="not_check_shoppinglist" name="not_check_shoppinglist" value="1">
 					<label class="form-check-label custom-control-label" for="not_check_shoppinglist">
-						{{ $__t('Do not check against the shopping list when adding missing items to it') }}&nbsp;&nbsp;
-						<span class="small text-muted">
-							{{ $__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') }}
-						</span>
+						{{ $__t('Do not check against the shopping list when adding missing items to it') }}&nbsp;
+						<i class="fas fa-question-circle"
+							data-toggle="tooltip" 
+							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 0c303223..5d1e08ec 100644
--- a/views/recipes.blade.php
+++ b/views/recipes.blade.php
@@ -179,9 +179,8 @@
 					@endif
 					@if(GROCY_FEATURE_FLAG_STOCK_PRICE_TRACKING)
 					<div class="col-6">
-						<label>{{ $__t('Costs') }}&nbsp;&nbsp;
-							<span class="small text-muted">{{ $__t('Based on the prices of the last purchase per product') }}</span>
-						</label>
+						<label>{{ $__t('Costs') }}&nbsp;</label>
+						<i class="fas fa-question-circle" data-toggle="tooltip" title="{{ $__t('Based on the prices of the last purchase per product') }}"></i>
 						<p class="mb-0">
 							<h3 class="locale-number locale-number-currency pt-0">{{ $selectedRecipeTotalCosts }}</h3>
 						</p>