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 983160bb4..0c383ddde 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
@@ -28,13 +28,13 @@
 <fieldset>
 	<h3><i class="icon-cogs"></i> {l s='Filters'}</h3>
 	<div class="filter-stock">
-			<form type="get" class="form-horizontal">
+			<form type="get" id="stock-movement-filter" 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();">
+						<select name="id_warehouse" onChange="$('#stock-movement-filter').submit();">
 							{foreach $list_warehouses as $warehouse}
 								<option {if $warehouse.id_warehouse == $current_warehouse}selected="selected"{/if} value="{$warehouse.id_warehouse}">{$warehouse.name}</option>
 							{/foreach}
diff --git a/controllers/admin/AdminStockMvtController.php b/controllers/admin/AdminStockMvtController.php
index 685016b41..7ff30e5c6 100644
--- a/controllers/admin/AdminStockMvtController.php
+++ b/controllers/admin/AdminStockMvtController.php
@@ -112,7 +112,16 @@ class AdminStockMvtControllerCore extends AdminController
 
 	public function initPageHeaderToolbar()
 	{
-		$this->page_header_toolbar_title = $this->l('Stock mouvement');		
+		$this->page_header_toolbar_title = $this->l('Stock mouvement');
+
+		if (Tools::isSubmit('id_warehouse') && (int)Tools::getValue('id_warehouse') != -1)
+			$this->page_header_toolbar_btn['export-stock-mvt-csv'] = array(
+				'short' => 'Export this list as CSV',
+				'href' => $this->context->link->getAdminLink('AdminStockMvt').'&amp;csv&amp;id_warehouse='.(int)$this->getCurrentWarehouseId(),
+				'desc' => $this->l('Export (CSV)'),
+				'imgclass' => 'export'
+			);
+
 		parent::initPageHeaderToolbar();
 	}
 
@@ -244,13 +253,13 @@ class AdminStockMvtControllerCore extends AdminController
 	public function initToolbar()
 	{
 		if (Tools::isSubmit('id_warehouse') && (int)Tools::getValue('id_warehouse') != -1)
-		{
 			$this->toolbar_btn['export-stock-mvt-csv'] = array(
 				'short' => 'Export this list as CSV',
 				'href' => $this->context->link->getAdminLink('AdminStockMvt').'&amp;csv&amp;id_warehouse='.(int)$this->getCurrentWarehouseId(),
 				'desc' => $this->l('Export (CSV)'),
+				'imgclass' => 'export'
 			);
-		}
+
 		parent::initToolbar();
 		unset($this->toolbar_btn['new']);
 	}