diff --git a/htdocs/admin/menus/index.php b/htdocs/admin/menus/index.php
index 1fd5365e272..b4536901da3 100644
--- a/htdocs/admin/menus/index.php
+++ b/htdocs/admin/menus/index.php
@@ -271,10 +271,12 @@ print '<table class="border" width="100%">';
 
 print '<tr class="liste_titre">';
 print '<td>'.$langs->trans("TreeMenuPersonalized").'</td>';
+print '<td align="right"><div id="iddivjstreecontrol"><a href="#">'.img_picto('','object_category').' '.$langs->trans("UndoExpandAll").'</a>';
+print ' | <a href="#">'.img_picto('','object_category-expanded').' '.$langs->trans("ExpandAll").'</a></div></td>';
 print '</tr>';
 
 print '<tr>';
-print '<td>';
+print '<td colspan="2">';
 
 // ARBORESCENCE
 
diff --git a/htdocs/core/lib/treeview.lib.php b/htdocs/core/lib/treeview.lib.php
index 7f8ed742fc6..2e6671f4550 100644
--- a/htdocs/core/lib/treeview.lib.php
+++ b/htdocs/core/lib/treeview.lib.php
@@ -180,19 +180,20 @@ function tree_showline($tab,$rang)
  */
 function tree_recur($tab,$pere,$rang)
 {
-	if (empty($pere['rowid'])) 
+	if (empty($pere['rowid']))
 	{
-		// Test also done with jstree and dynatree (not able to have <a> inside label) 
+		// Test also done with jstree and dynatree (not able to have <a> inside label)
 		print '<script type="text/javascript" language="javascript">
 		$(document).ready(function(){
 			$("#iddivjstree").treeview({
 				collapsed: true,
 				animated: "fast",
-				persist: "location"
+				persist: "location",
+				control: "#iddivjstreecontrol"
 			});
 		})
 		</script>';
-		
+
 		print '<ul id="iddivjstree" style="min-height:300px;">';
 	}
 
@@ -207,7 +208,7 @@ function tree_recur($tab,$pere,$rang)
 		// If an element has $pere for parent
 		if ($tab[$x]['fk_menu'] != -1 && $tab[$x]['fk_menu'] == $pere['rowid'])
 		{
-			if (empty($ulprinted) && ! empty($pere['rowid'])) { print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++; } 
+			if (empty($ulprinted) && ! empty($pere['rowid'])) { print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++; }
 			print "\n".'<li>';
 			// We shot it with an offset
 			tree_showline($tab[$x],$rang);
@@ -218,7 +219,7 @@ function tree_recur($tab,$pere,$rang)
 		}
 		elseif (! empty($tab[$x]['rowid']) && $tab[$x]['fk_menu'] == -1 && $tab[$x]['fk_mainmenu'] == $pere['mainmenu'] && $tab[$x]['fk_leftmenu'] == $pere['leftmenu'])
 		{
-			if (empty($ulprinted) && ! empty($pere['rowid'])) { print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++; } 
+			if (empty($ulprinted) && ! empty($pere['rowid'])) { print '<ul'.(empty($pere['rowid'])?' id="treeData"':'').'>'; $ulprinted++; }
 			print "\n".'<li>';
 			// We shot it with an offset
 			tree_showline($tab[$x],$rang);
@@ -229,7 +230,7 @@ function tree_recur($tab,$pere,$rang)
 		}
 	}
 	if (! empty($ulprinted) && ! empty($pere['rowid'])) { print '</ul>'."\n"; }
-	
+
 	if (empty($pere['rowid'])) print '</ul>';
 }
 
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/ajax-loader.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/ajax-loader.gif
new file mode 100644
index 00000000000..bc545850add
Binary files /dev/null and b/htdocs/includes/jquery/plugins/jquerytreeview/images/ajax-loader.gif differ
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/file.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/file.gif
new file mode 100644
index 00000000000..7e6216798f8
Binary files /dev/null and b/htdocs/includes/jquery/plugins/jquerytreeview/images/file.gif differ
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/folder-closed.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/folder-closed.gif
new file mode 100644
index 00000000000..541107888e6
Binary files /dev/null and b/htdocs/includes/jquery/plugins/jquerytreeview/images/folder-closed.gif differ
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/folder.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/folder.gif
new file mode 100644
index 00000000000..2b31631ca2b
Binary files /dev/null and b/htdocs/includes/jquery/plugins/jquerytreeview/images/folder.gif differ
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/minus.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/minus.gif
new file mode 100644
index 00000000000..47fb7b767c4
Binary files /dev/null and b/htdocs/includes/jquery/plugins/jquerytreeview/images/minus.gif differ
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/plus.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/plus.gif
new file mode 100644
index 00000000000..6906621627d
Binary files /dev/null and b/htdocs/includes/jquery/plugins/jquerytreeview/images/plus.gif differ
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-black-line.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-black-line.gif
new file mode 100644
index 00000000000..e5496877a07
Binary files /dev/null and b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-black-line.gif differ
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-black.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-black.gif
new file mode 100644
index 00000000000..d549b9fc56c
Binary files /dev/null and b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-black.gif differ
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-default-line.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-default-line.gif
new file mode 100644
index 00000000000..37114d3068e
Binary files /dev/null and b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-default-line.gif differ
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-default.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-default.gif
new file mode 100644
index 00000000000..a12ac52ffe4
Binary files /dev/null and b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-default.gif differ
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam-line.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam-line.gif
new file mode 100644
index 00000000000..6e289cecc51
Binary files /dev/null and b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam-line.gif differ
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam.gif
new file mode 100644
index 00000000000..0cb178e8992
Binary files /dev/null and b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-famfamfam.gif differ
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-gray-line.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-gray-line.gif
new file mode 100644
index 00000000000..37600447dc0
Binary files /dev/null and b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-gray-line.gif differ
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-gray.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-gray.gif
new file mode 100644
index 00000000000..cfb8a2f0961
Binary files /dev/null and b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-gray.gif differ
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-red-line.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-red-line.gif
new file mode 100644
index 00000000000..df9e749a8f1
Binary files /dev/null and b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-red-line.gif differ
diff --git a/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-red.gif b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-red.gif
new file mode 100644
index 00000000000..3bbb3a157f1
Binary files /dev/null and b/htdocs/includes/jquery/plugins/jquerytreeview/images/treeview-red.gif differ