diff --git a/localization/strings.pot b/localization/strings.pot
index 319e2fec..b13a152d 100644
--- a/localization/strings.pot
+++ b/localization/strings.pot
@@ -1843,3 +1843,6 @@ msgstr ""
 
 msgid "Not enough in stock (not included in costs), %1$s missing, %2$s already on shopping list"
 msgstr ""
+
+msgid "Quantity unit stock cannot be changed after first purchase"
+msgstr ""
diff --git a/views/components/numberpicker.blade.php b/views/components/numberpicker.blade.php
index 3ffa3cb6..db52ea8c 100644
--- a/views/components/numberpicker.blade.php
+++ b/views/components/numberpicker.blade.php
@@ -19,7 +19,7 @@
 <div id="group-{{ $id }}" class="form-group {{ $additionalGroupCssClasses }}">
 	<label for="{{ $id }}">
 		{{ $__t($label) }}&nbsp;
-		<i class="fas fa-question-circle" id="{{ $hintId }}" data-toggle="tooltip" title="{{ $hint }}"></i>{!! $additionalHtmlContextHelp !!}</label>
+		<span id="{{ $hintId }}" data-toggle="tooltip" title="{{ $hint }}"></span>{!! $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 2d2cf033..ac7f51a6 100644
--- a/views/components/productpicker.blade.php
+++ b/views/components/productpicker.blade.php
@@ -16,7 +16,6 @@
 	<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>
diff --git a/views/productform.blade.php b/views/productform.blade.php
index 5c566300..ca924a08 100644
--- a/views/productform.blade.php
+++ b/views/productform.blade.php
@@ -170,7 +170,7 @@
 
 			<div class="form-group">
 				<label for="qu_id_stock">{{ $__t('Quantity unit stock') }}</label>
-				<i class="fas fa-question-circle" data-toggle="tooltip" title="Quantity unit stock cannot be changed after first purchase"></i>
+				<i class="fas fa-question-circle" data-toggle="tooltip" title="{{ $__t('Quantity unit stock cannot be changed after first purchase') }}"></i>
 				<select required class="form-control input-group-qu" id="qu_id_stock" name="qu_id_stock" @if($mode == 'edit') disabled @endif>
 					<option></option>
 					@foreach($quantityunits as $quantityunit)