diff --git a/admin-dev/themes/template/list_content.tpl b/admin-dev/themes/template/list_content.tpl
index 50fbcf2c5..d64cf84bd 100644
--- a/admin-dev/themes/template/list_content.tpl
+++ b/admin-dev/themes/template/list_content.tpl
@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -36,14 +36,14 @@
 			{/if}
 		</td>
 		{foreach $fields_display AS $key => $params}
-			<td 
-				{if isset($params.position)} 
+			<td
+				{if isset($params.position)}
 					id="td_{if $id_category}$id_category{else}0{/if}_{$tr.$identifier}"
 				{/if}
 				class="{if !$no_link}pointer{/if}
 					   {if isset($params.position) && $order_by == 'position'} dragHandle{/if}
 					   {if isset($params.align)} {$params.align}{/if}"
-				
+
 			{if (!isset($params.position) && !$no_link)}
 				onclick="document.location = '{$current_index}&{$identifier}={$tr.$identifier}{if $view}&view{else}&update{/if}{$table}&token={$token}'">{if isset($params.prefix)}$params.prefix{/if}
 			{else}
@@ -68,8 +68,8 @@
 				{/if}
 			{elseif isset($params.image)}
 				{$tr.$key}
-			{*{elseif (isset($params.icon) && (isset($params['icon'][$tr[$key]]) || isset($params['icon']['default'])))}
-				<img src="../img/admin/{$tr.$key.icon_path}" alt="$tr.$key" title="$tr.$key" />*}
+			{elseif (isset($params.icon))}
+				<img src="../img/admin/{$tr[$key]}" alt="{$tr[$key]}" title="{$tr[$key]}" />
             {elseif isset($params.price)}
 				{$tr.$key}
 			{elseif isset($params.float)}
diff --git a/admin-dev/themes/template/list_header.tpl b/admin-dev/themes/template/list_header.tpl
index df5b5cdb2..d2c56a594 100644
--- a/admin-dev/themes/template/list_header.tpl
+++ b/admin-dev/themes/template/list_header.tpl
@@ -1,5 +1,5 @@
 {*
-* 2007-2011 PrestaShop 
+* 2007-2011 PrestaShop
 *
 * NOTICE OF LICENSE
 *
@@ -42,7 +42,16 @@
 	</script>
 	<script type="text/javascript" src="../js/admin-dnd.js"></script>
 {/if}
-				
+
+<script type="text/javascript">
+	$(function() {
+		$(".datepicker").datepicker({
+			prevText:"",
+			nextText:""
+		});
+	});
+</script>
+
 {if $add_button}
 	<br /><a href="{$currentIndex}&add{$table}&token={$token}"><img src="../img/admin/add.gif" border="0" /> {l s='Add new'}</a><br /><br />
 {/if}
@@ -104,7 +113,7 @@
 									{/if}
 								</th>
 							{/foreach}
-				
+
 							{if $shop_link_type}
 								<th style="width: 80px">
 									{if $shop_link_type == 'shop'}
@@ -113,7 +122,7 @@
 										{l s='Group shop'}
 									{/if}
 								</th>
-							{/if}			
+							{/if}
 							{if $has_actions}
 								<th style="width: 52px">{l s='Actions'}</th>
 							{/if}
@@ -124,7 +133,7 @@
 									--
 								{/if}
 							</td>
-				
+
 							{* Filters (input, select, date or bool) *}
 							{foreach $fields_display AS $key => $params}
 								<td {if isset($params.align)} class="{$params.align}" {/if}>
@@ -138,8 +147,8 @@
 												<option value="0" {if $params.value == 0 && $params.value != ''} selected="selected" {/if}>{l s='No'}</option>
 											</select>
 										{elseif $params.type == 'date' || $params.type == 'datetime'}
-											{l s='From'} <input type="text" class="filter" id="{$name_id}_0" name="{$name}[0]" value="{if isset($value.0)}$value.0{/if}"{if isset($params.width)} style="width:{$params.width}px"{/if}/><br />
-											{l s='To'} <input type="text" class="filter" id="{$name_id}_1" name="{$name}[1]" value="{if isset($value.1)}$value.1{/if}"{if isset($params.width)} style="width:{$params.width}px"{/if}/>
+											{l s='From'} <input type="text" class="filter datepicker" id="{$name_id}_0" name="{$name}[0]" value="{if isset($value.0)}$value.0{/if}"{if isset($params.width)} style="width:{$params.width}px"{/if}/><br />
+											{l s='To'} <input type="text" class="filter datepicker" id="{$name_id}_1" name="{$name}[1]" value="{if isset($value.1)}$value.1{/if}"{if isset($params.width)} style="width:{$params.width}px"{/if}/>
 										{elseif $params.type == 'select'}
 											{if isset($params.filter_key)}
 												<select onchange="$('#submitFilterButton{$table}').focus();$('#submitFilterButton{$table}').click();" name="{$table}Filter_{$params.filter_key}" {if isset($params.width)} style="width:{$params.width}px"{/if}>
@@ -157,7 +166,7 @@
 									{/if}
 								</td>
 							{/foreach}
-							
+
 							{if $shop_link_type}
 								<td>--</td>
 							{/if}
diff --git a/classes/HelperList.php b/classes/HelperList.php
index dae1477e2..b9a85be64 100644
--- a/classes/HelperList.php
+++ b/classes/HelperList.php
@@ -241,7 +241,7 @@ class HelperListCore extends Helper
 					else
 						$echo = $tr[$key];
 
-					$this->_list[$index][$key] = isset($params['callback']) ? call_user_func_array(array((isset($params['callback_object'])) ? $params['callback_object'] : $this->className, $params['callback']), array($echo, $tr)) : $echo;
+					$this->_list[$index][$key] = isset($params['callback']) ? call_user_func_array(array((isset($params['callback_object'])) ? $params['callback_object'] : $this->context->controller, $params['callback']), array($echo, $tr)) : $echo;
 				}
 			}
 		}
@@ -383,7 +383,7 @@ class HelperListCore extends Helper
 						$value = '';
 					$name = $this->table.'Filter_'.(isset($params['filter_key']) ? $params['filter_key'] : $key);
 					$name_id = str_replace('!', '__', $name);
-					$this->includeDatepicker(array($name_id.'_0', $name_id.'_1'));
+					$this->context->controller->addJqueryUI('ui.datepicker');
 					break;
 				case 'select':
 					foreach ($params['select'] AS $option_value => $option_display)