diff --git a/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl
index e91f33f10..8b4e132b3 100644
--- a/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/stock_cover/helpers/list/list_header.tpl
@@ -24,40 +24,43 @@
 *}
 {extends file="helpers/list/list_header.tpl"}
 {block name=override_header}
-<div class="filter-stock-extended">
-	<form id="stock_cover" type="get" class="form-horizontal">
-		<input type="hidden" name="controller" value="AdminStockCover" />
-		<input type="hidden" name="token" value="{$token}" />
-		{if count($stock_cover_periods) > 1}
-		<div class="form-group">
-			<label for="coverage_period" class="control-label col-lg-3">{l s='Filter by period:'}</label>
-			<div class="col-lg-9">
-				<select name="coverage_period" onChange="$(this).parent().parent().submit();">
-					{foreach from=$stock_cover_periods key=k item=i}
-						<option {if $i == $stock_cover_cur_period} selected="selected"{/if} value="{$i}">{$k}</option>
-					{/foreach}
-				</select>
+<fieldset>
+	<h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
+	<div class="filter-stock-extended">
+		<form id="stock_cover" type="get" class="form-horizontal">
+			<input type="hidden" name="controller" value="AdminStockCover" />
+			<input type="hidden" name="token" value="{$token}" />
+			{if count($stock_cover_periods) > 1}
+			<div class="form-group">
+				<label for="coverage_period" class="control-label col-lg-3">{l s='Filter by period:'}</label>
+				<div class="col-lg-9">
+					<select name="coverage_period" onChange="$(this).parent().parent().submit();">
+						{foreach from=$stock_cover_periods key=k item=i}
+							<option {if $i == $stock_cover_cur_period} selected="selected"{/if} value="{$i}">{$k}</option>
+						{/foreach}
+					</select>
+				</div>
 			</div>
-		</div>
-		{/if}
-		{if count($stock_cover_warehouses) > 0}
-		<div class="form-group">
-			<label for="id_warehouse" class="control-label col-lg-3">{l s='Filter by warehouse:'}</label>
-			<div class="col-lg-9">
-				<select name="id_warehouse" onChange="$(this).parent().parent().submit();">
-					{foreach from=$stock_cover_warehouses key=k item=i}
-						<option {if $i.id_warehouse == $stock_cover_cur_warehouse} selected="selected"{/if} value="{$i.id_warehouse}">{$i.name}</option>
-					{/foreach}
-				</select>
+			{/if}
+			{if count($stock_cover_warehouses) > 0}
+			<div class="form-group">
+				<label for="id_warehouse" class="control-label col-lg-3">{l s='Filter by warehouse:'}</label>
+				<div class="col-lg-9">
+					<select name="id_warehouse" onChange="$(this).parent().parent().submit();">
+						{foreach from=$stock_cover_warehouses key=k item=i}
+							<option {if $i.id_warehouse == $stock_cover_cur_warehouse} selected="selected"{/if} value="{$i.id_warehouse}">{$i.name}</option>
+						{/foreach}
+					</select>
+				</div>
 			</div>
-		</div>
-		{/if}
-		<div class="form-group">
-			<label for="warn_days" class="control-label col-lg-3">{l s='Highlight when coverage (in days) is less than:'}</label>
-			<div class="col-lg-9">
-				<input name="warn_days" type="text" size="3" onChange="$(this).parent().parent().submit();" value="{if isset($stock_cover_warn_days)}{$stock_cover_warn_days}{/if}" />
+			{/if}
+			<div class="form-group">
+				<label for="warn_days" class="control-label col-lg-3">{l s='Highlight when coverage (in days) is less than:'}</label>
+				<div class="col-lg-9">
+					<input name="warn_days" type="text" size="3" onChange="$(this).parent().parent().submit();" value="{if isset($stock_cover_warn_days)}{$stock_cover_warn_days}{/if}" />
+				</div>
 			</div>
-		</div>
-	</form>
-</div>
+		</form>
+	</div>
+</fieldset>
 {/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl
index b54181ee6..d86729b22 100644
--- a/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/stock_instant_state/helpers/list/list_header.tpl
@@ -24,22 +24,25 @@
 *}
 {extends file="helpers/list/list_header.tpl"}
 {block name=override_header}
-<div class="filter-stock">
-	<form id="stock_instant_state" type="get" class="form-horizontal">
-		<input type="hidden" name="controller" value="AdminStockInstantState" />
-		<input type="hidden" name="token" value="{$token}" />
-	{if count($stock_instant_state_warehouses) > 0}
-		<div id="stock_instant_state_form_warehouse" class="form-group">
-			<label for="id_warehouse" class="control-label col-lg-3">{l s='Filter by warehouse:'}</label>
-			<div class="col-lg-9">
-				<select name="id_warehouse" onChange="$(this).parent().parent().submit();">
-					{foreach from=$stock_instant_state_warehouses key=k item=i}
-						<option {if $i.id_warehouse == $stock_instant_state_cur_warehouse} selected="selected"{/if} value="{$i.id_warehouse}">{$i.name}</option>
-					{/foreach}
-				</select>
+<fieldset>
+	<h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
+	<div class="filter-stock">
+		<form id="stock_instant_state" type="get" class="form-horizontal">
+			<input type="hidden" name="controller" value="AdminStockInstantState" />
+			<input type="hidden" name="token" value="{$token}" />
+		{if count($stock_instant_state_warehouses) > 0}
+			<div id="stock_instant_state_form_warehouse" class="form-group">
+				<label for="id_warehouse" class="control-label col-lg-3">{l s='Filter by warehouse:'}</label>
+				<div class="col-lg-9">
+					<select name="id_warehouse" onChange="$(this).parent().parent().submit();">
+						{foreach from=$stock_instant_state_warehouses key=k item=i}
+							<option {if $i.id_warehouse == $stock_instant_state_cur_warehouse} selected="selected"{/if} value="{$i.id_warehouse}">{$i.name}</option>
+						{/foreach}
+					</select>
+				</div>
 			</div>
-		</div>
-	{/if}
-	</form>
-</div>
+		{/if}
+		</form>
+	</div>
+</fieldset>
 {/block}
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl
index 4c2abf445..983160bb4 100644
--- a/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/stock_mvt/helpers/list/list_header.tpl
@@ -25,21 +25,24 @@
 {extends file="helpers/list/list_header.tpl"}
 {block name=override_header}
 	{if count($list_warehouses) > 0}
-<div class="filter-stock">
-		<form type="get" class="form-horizontal">
-			<input type="hidden" name="controller" value="AdminStockMvt" />
-			<input type="hidden" name="token" value="{$token}" />
-			<div class="form-group">
-				<label for="id_warehouse" class="control-label col-lg-3">{l s='Filter movements by warehouse:'}</label>
-				<div class="col-lg-9">					
-					<select name="id_warehouse" onChange="$(this).parent().submit();">
-						{foreach $list_warehouses as $warehouse}
-							<option {if $warehouse.id_warehouse == $current_warehouse}selected="selected"{/if} value="{$warehouse.id_warehouse}">{$warehouse.name}</option>
-						{/foreach}
-					</select>
+<fieldset>
+	<h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
+	<div class="filter-stock">
+			<form type="get" class="form-horizontal">
+				<input type="hidden" name="controller" value="AdminStockMvt" />
+				<input type="hidden" name="token" value="{$token}" />
+				<div class="form-group">
+					<label for="id_warehouse" class="control-label col-lg-3">{l s='Filter movements by warehouse:'}</label>
+					<div class="col-lg-9">					
+						<select name="id_warehouse" onChange="$(this).parent().submit();">
+							{foreach $list_warehouses as $warehouse}
+								<option {if $warehouse.id_warehouse == $current_warehouse}selected="selected"{/if} value="{$warehouse.id_warehouse}">{$warehouse.name}</option>
+							{/foreach}
+						</select>
+					</div>
 				</div>
-			</div>
-		</form>
-	{/if}
-</div>
+			</form>
+		{/if}
+	</div>
+</fieldset>
 {/block}
diff --git a/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl
index 1d0df261c..87af2c852 100644
--- a/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/supply_orders/helpers/list/list_header.tpl
@@ -25,28 +25,31 @@
 {extends file="helpers/list/list_header.tpl"}
 {block name=override_header}
 {if isset($warehouses) && count($warehouses) > 0 && isset($filter_status)}
-<div class="filter-stock-extended">
-	<form id="supply_orders" type="get" class="form-horizontal">
-		<input type="hidden" name="controller" value="AdminSupplyOrders" />
-		<input type="hidden" name="token" value="{$token}" />
-		<div class="form-group">
-			<label for="id_warehouse" class="control-label col-lg-3">{l s='Filter by warehouse:'}</label>
-			<div class="col-lg-9">
-				<select name="id_warehouse" onChange="$(this).parent().parent().submit();">
-				{foreach from=$warehouses key=k item=i}
-					<option {if $i.id_warehouse == $current_warehouse} selected="selected"{/if} value="{$i.id_warehouse}">{$i.name}</option>
-				{/foreach}
-				</select>
+<fieldset>
+	<h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
+	<div class="filter-stock-extended">
+		<form id="supply_orders" type="get" class="form-horizontal">
+			<input type="hidden" name="controller" value="AdminSupplyOrders" />
+			<input type="hidden" name="token" value="{$token}" />
+			<div class="form-group">
+				<label for="id_warehouse" class="control-label col-lg-3">{l s='Filter by warehouse:'}</label>
+				<div class="col-lg-9">
+					<select name="id_warehouse" onChange="$(this).parent().parent().submit();">
+					{foreach from=$warehouses key=k item=i}
+						<option {if $i.id_warehouse == $current_warehouse} selected="selected"{/if} value="{$i.id_warehouse}">{$i.name}</option>
+					{/foreach}
+					</select>
+				</div>
 			</div>
-		</div>
-		<div class="form-group">
-			<div class="checkbox col-lg-3 col-lg-push-3">
-				<label for="filter_status">
-					<input type="checkbox" name="filter_status" class="noborder" onChange="$(this).parent().parent().submit();" {if $filter_status == 1}value="on" checked{/if} /> {l s='Choose not to display completed/canceled orders:'}
-				</label>
+			<div class="form-group">
+				<div class="checkbox col-lg-3 col-lg-push-3">
+					<label for="filter_status">
+						<input type="checkbox" name="filter_status" class="noborder" onChange="$(this).parent().parent().submit();" {if $filter_status == 1}value="on" checked{/if} /> {l s='Choose not to display completed/canceled orders:'}
+					</label>
+				</div>
 			</div>
-		</div>
-	</form>
-</div>
+		</form>
+	</div>
+</fieldset>
 {/if}
 {/block}
\ No newline at end of file
diff --git a/controllers/admin/AdminStockInstantStateController.php b/controllers/admin/AdminStockInstantStateController.php
index 5dc0b6f8e..c0649f3e4 100644
--- a/controllers/admin/AdminStockInstantStateController.php
+++ b/controllers/admin/AdminStockInstantStateController.php
@@ -75,19 +75,22 @@ class AdminStockInstantStateControllerCore extends AdminController
 			),
 			'physical_quantity' => array(
 				'title' => $this->l('Physical quantity'),
-				'width' => 80,
+				'class' => 'fixed-width-xs',
+				'align' => 'center',
 				'orderby' => true,
 				'search' => false
 			),
 			'usable_quantity' => array(
 				'title' => $this->l('Usable quantity'),
-				'width' => 80,
+				'class' => 'fixed-width-xs',
+				'align' => 'center',
 				'orderby' => true,
 				'search' => false,
 			),
 			'real_quantity' => array(
 				'title' => $this->l('Real quantity'),
-				'width' => 80,
+				'class' => 'fixed-width-xs',
+				'align' => 'center',
 				'orderby' => false,
 				'search' => false,
 				'hint' => $this->l('Physical quantity (usable) - Client orders + Supply Orders'),
diff --git a/controllers/admin/AdminStockMvtController.php b/controllers/admin/AdminStockMvtController.php
index e9fd5be3b..685016b41 100644
--- a/controllers/admin/AdminStockMvtController.php
+++ b/controllers/admin/AdminStockMvtController.php
@@ -67,7 +67,6 @@ class AdminStockMvtControllerCore extends AdminController
 			),
 			'sign' => array(
 				'title' => $this->l('Sign'),
-				'width' => 100,
 				'align' => 'center',
 				'type' => 'select',
 				'filter_key' => 'a!sign',
@@ -79,15 +78,16 @@ class AdminStockMvtControllerCore extends AdminController
 					-1 => 'remove_stock.png',
 					1 => 'add_stock.png'
 				),
+				'class' => 'fixed-width-xs'
 			),
 			'physical_quantity' => array(
 				'title' => $this->l('Quantity'),
-				'filter_key' => 'a!physical_quantity'
+				'align' => 'center',
+				'filter_key' => 'a!physical_quantity',
+				'class' => 'fixed-width-sm'
 			),
 			'price_te' => array(
 				'title' => $this->l('Price (tax excl.)'),
-				'width' => 70,
-				'align' => 'right',
 				'type' => 'price',
 				'currency' => true,
 				'filter_key' => 'a!price_te'
@@ -102,7 +102,6 @@ class AdminStockMvtControllerCore extends AdminController
 			),
 			'date_add' => array(
 				'title' => $this->l('Date'),
-				'align' => 'right',
 				'type' => 'datetime',
 				'filter_key' => 'a!date_add'
 			),