diff --git a/views/batteriesjournal.blade.php b/views/batteriesjournal.blade.php
index 4763dae7..daee4d49 100644
--- a/views/batteriesjournal.blade.php
+++ b/views/batteriesjournal.blade.php
@@ -9,22 +9,30 @@
 	<div class="col">
 		<h2>@yield('title')</h2>
 	</div>
-	<hr>
 </div>
 
+<hr>
 <div class="row my-3">
 	<div class="col-xs-12 col-md-6 col-xl-3">
-		<label for="search">{{ $__t('Search') }}</label> <i class="fas fa-search"></i>
-		<input type="text" class="form-control" id="search">
+		<div class="input-group mb-3">
+			<div class="input-group-prepend">
+					<span class="input-group-text"><i class="fas fa-search"></i></span>
+			</div>
+			<input type="text"  id="search" class="form-control" placeholder="{{ $__t('Search') }}">
+		</div>
 	</div>
 	<div class="col-xs-12 col-md-6 col-xl-3">
-		<label for="battery-filter">{{ $__t('Filter by battery') }}</label> <i class="fas fa-filter"></i>
-		<select class="form-control" id="battery-filter">
-			<option value="all">{{ $__t('All') }}</option>
+		<div class="input-group mb-3">
+			<div class="input-group-prepend">
+					<span class="input-group-text"><i class="fas fa-filter"></i></span>
+			</div>
+			<select class="form-control" id="battery-filter">
+				<option value="all">{{ $__t('All') }}</option>
 			@foreach($batteries as $battery)
 				<option value="{{ $battery->id }}">{{ $battery->name }}</option>
 			@endforeach
-		</select>
+			</select>
+		</div>
 	</div>
 </div>
 
diff --git a/views/stockentries.blade.php b/views/stockentries.blade.php
index cba20ca6..a902c377 100644
--- a/views/stockentries.blade.php
+++ b/views/stockentries.blade.php
@@ -22,9 +22,8 @@
 			'disallowAllProductWorkflows' => true
 		))
 	</div>
-	<hr>
 </div>
-
+<hr>
 <div class="row">
 	<div class="col">
 		<table id="stockentries-table" class="table table-sm table-striped dt-responsive">
diff --git a/views/stockjournal.blade.php b/views/stockjournal.blade.php
index 366bff0c..ce1e73dc 100644
--- a/views/stockjournal.blade.php
+++ b/views/stockjournal.blade.php
@@ -9,22 +9,30 @@
 	<div class="col">
 		<h2>@yield('title')</h2>
 	</div>
-	<hr>
 </div>
 
+<hr>
 <div class="row my-3">
 	<div class="col-xs-12 col-md-6 col-xl-3">
-		<label for="search">{{ $__t('Search') }}</label> <i class="fas fa-search"></i>
-		<input type="text" class="form-control" id="search">
+		<div class="input-group mb-3">
+			<div class="input-group-prepend">
+					<span class="input-group-text"><i class="fas fa-search"></i></span>
+			</div>
+			<input type="text"  id="search" class="form-control" placeholder="{{ $__t('Search') }}">
+		</div>
 	</div>
 	<div class="col-xs-12 col-md-6 col-xl-3">
-		<label for="product-filter">{{ $__t('Filter by product') }}</label> <i class="fas fa-filter"></i>
-		<select class="form-control" id="product-filter">
-			<option value="all">{{ $__t('All') }}</option>
-			@foreach($products as $product)
-				<option value="{{ $product->id }}">{{ $product->name }}</option>
-			@endforeach
-		</select>
+		<div class="input-group mb-3">
+			<div class="input-group-prepend">
+					<span class="input-group-text"><i class="fas fa-filter"></i></span>
+			</div>
+			<select class="form-control" id="product-filter">
+				<option value="all">{{ $__t('All') }}</option>
+				@foreach($products as $product)
+					<option value="{{ $product->id }}">{{ $product->name }}</option>
+				@endforeach
+			</select>
+		</div>
 	</div>
 </div>