diff --git a/admin-dev/themes/default/template/controllers/products/helpers/list/list_header.tpl b/admin-dev/themes/default/template/controllers/products/helpers/list/list_header.tpl
index 0d317eabc..27cb7b66b 100644
--- a/admin-dev/themes/default/template/controllers/products/helpers/list/list_header.tpl
+++ b/admin-dev/themes/default/template/controllers/products/helpers/list/list_header.tpl
@@ -27,30 +27,6 @@
 
 {block name=leadin}
 	{if isset($category_tree)}
-		<script type="text/javascript">
-			$(document).ready(function(){
-				var base_url = '{$base_url}';
-				// Load category products page when category is clicked
-				$('#categories-treeview :input').live('click', function(){
-					if (this.value !== "")
-						location.href = base_url + '&id_category=' + parseInt(this.value);
-					else
-						location.href = base_url + '&reset_filter_category=1';
-				});
-				// Make sure the checkbox is checked/unchecked when the link is clicked
-				$('#toggle_category_tree').bind('click', function(event){
-					event.preventDefault();
-					$('#block_category_tree').toggle();
-					if ($('#block_category_tree').is(':visible'))
-						$(this).find('input').attr('checked', true);
-					else
-					{
-						$(this).find('input').removeAttr('checked');
-						location.href = base_url + '&reset_filter_category=1';
-					}
-				});
-			});
-		</script>
 		<div class="bloc-leadin">
 			<div id="container_category_tree">
 				{$category_tree}
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_associated_categories.tpl b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_associated_categories.tpl
new file mode 100644
index 000000000..0239a9894
--- /dev/null
+++ b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_associated_categories.tpl
@@ -0,0 +1,116 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<div class="panel">
+	{if isset($header)}{$header}{/if}
+	{if isset($nodes)}
+	<ul id="{$id}" class="tree">
+		{$nodes}
+	</ul>
+	{/if}
+</div>
+<script type="text/javascript">
+	{if isset($use_checkbox) && $use_checkbox == true}
+		function checkAllAssociatedCategories($tree)
+		{
+			$tree.find(":input[type=checkbox]").each(
+				function()
+				{
+					$(this).prop("checked", true);
+					$(this).parent().addClass("tree-selected");
+				}
+			);
+		}
+
+		function uncheckAllAssociatedCategories($tree)
+		{
+			$tree.find(":input[type=checkbox]").each(
+				function()
+				{
+					$(this).prop("checked", false);
+					$(this).parent().removeClass("tree-selected");
+				}
+			);
+		}
+	{/if}
+	{if isset($use_search) && $use_search == true}
+		$("#{$id}-categories-search").bind("typeahead:selected", function(obj, datum) {
+		    $("#{$id}").find(":input").each(
+				function()
+				{
+					if ($(this).val() == datum.id_category)
+					{
+						$(this).prop("checked", true);
+						$(this).parent().addClass("tree-selected");
+						$(this).parents("ul.tree").each(
+							function()
+							{
+								$(this).children().children().children(".icon-folder-close")
+									.removeClass("icon-folder-close")
+									.addClass("icon-folder-open");
+								$(this).show();
+							}
+						);
+					}
+				}
+			);
+		});
+	{/if}
+	$(document).ready(function () {
+		$("#{$id}").tree("collapseAll");
+		$("#{$id}").find(":input[type=radio]").click(
+			function()
+			{
+				location.href = location.href.replace(
+					/&id_category=[0-9]*/, "")+"&id_category="
+					+$(this).val();
+			}
+		);
+
+		{if isset($selected_categories)}
+			{assign var=imploded_selected_categories value='","'|implode:$selected_categories}
+			var selected_categories = new Array("{$imploded_selected_categories}");
+
+			$("#{$id}").find(":input").each(
+				function()
+				{
+					if ($.inArray($(this).val(), selected_categories) != -1)
+					{
+						$(this).prop("checked", true);
+						$(this).parent().addClass("tree-selected");
+						$(this).parents("ul.tree").each(
+							function()
+							{
+								$(this).children().children().children(".icon-folder-close")
+									.removeClass("icon-folder-close")
+									.addClass("icon-folder-open");
+								$(this).show();
+							}
+						);
+					}
+				}
+			);
+		{/if}
+	});
+</script>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_associated_header.tpl b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_associated_header.tpl
new file mode 100644
index 000000000..416c07b1e
--- /dev/null
+++ b/admin-dev/themes/default/template/controllers/products/helpers/tree/tree_associated_header.tpl
@@ -0,0 +1,28 @@
+{*
+* 2007-2013 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* If you did not receive a copy of the license and are unable to
+* obtain it through the world-wide-web, please send an email
+* to license@prestashop.com so we can send you a copy immediately.
+*
+* DISCLAIMER
+*
+* Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+* versions in the future. If you wish to customize PrestaShop for your
+* needs please refer to http://www.prestashop.com for more information.
+*
+*  @author PrestaShop SA <contact@prestashop.com>
+*  @copyright  2007-2013 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*}
+<div class="panel-heading">
+	<i class="icon-tags"></i>&nbsp;{l s=$title}
+	<div class="pull-right">{if isset($toolbar)}{$toolbar}{/if}</div>
+</div>
\ No newline at end of file
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 2573a396e..2b3014a80 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2892,7 +2892,9 @@ class AdminProductsControllerCore extends AdminController
 			$categories[] = $key;
 
 		$tree = new HelperTreeCategories('associated-categories-tree', 'Associated categories');
-		$tree->setRootCategory($root->id)
+		$tree->setTemplate('tree_associated_categories.tpl')
+			->setHeaderTemplate('tree_associated_header.tpl')
+			->setRootCategory($root->id)
 			->setUseCheckBox(true)
 			->setUseSearch(true)
 			->setSelectedCategories($categories);