diff --git a/build/tgz/tar.exclude b/build/tgz/tar.exclude
index 81492ffabfe..f9784198702 100644
--- a/build/tgz/tar.exclude
+++ b/build/tgz/tar.exclude
@@ -26,15 +26,17 @@ htdocs/includes/phplot5/doc
 htdocs/includes/phplot5/examples
 htdocs/includes/scriptaculous/test
 htdocs/includes/treemenu/docs
+htdocs/includes/treemenu/images
 htdocs/includes/treemenu/imagesAlt
 htdocs/includes/treemenu/imagesAlt2
-htdocs/includes/modules/modEditeur.class.php 
-htdocs/includes/modules/modDocument.class.php 
-htdocs/includes/modules/modDomain.class.php 
-htdocs/includes/modules/modDroitPret.class.php 
-htdocs/includes/modules/modPostnuke.class.php 
-htdocs/includes/modules/modClickToDial.class.php 
-htdocs/includes/modules/modBookmark4u.class.php 
+htdocs/includes/modules/modBarcode.class.php
+htdocs/includes/modules/modBookmark4u.class.php
+htdocs/includes/modules/modClickToDial.class.php
+htdocs/includes/modules/modDocument.class.php
+htdocs/includes/modules/modDomain.class.php
+htdocs/includes/modules/modDroitPret.class.php
+htdocs/includes/modules/modEditeur.class.php
+htdocs/includes/modules/modPostnuke.class.php
 htdocs/includes/triggers/interface_user.class.php
 htdocs/includes/triggers/interface_contractfrombill.class.php-NORUN
 htdocs/theme/rodolphe
diff --git a/htdocs/categories/index.php b/htdocs/categories/index.php
index 4a1b3693ccf..3154cd8cd5c 100644
--- a/htdocs/categories/index.php
+++ b/htdocs/categories/index.php
@@ -197,10 +197,9 @@ if ($conf->use_javascript)
 		
 		// Affiche arbre
 		print '<script src="'.DOL_URL_ROOT.'/includes/treemenu/TreeMenu.js" language="JavaScript" type="text/javascript"></script>';
-		
 		$treeMenu = new HTML_TreeMenu_DHTML($menu,
 			array(
-			'images' => DOL_URL_ROOT.'/includes/treemenu/images',
+			'images' => DOL_URL_ROOT.'/theme/common/treemenu',
 			'defaultClass' => 'treeMenuDefault',
 			'noTopLevelImages' => false,
 			'jsObjectName' => 'tree_categories',
diff --git a/htdocs/includes/treemenu/.cvsignore b/htdocs/includes/treemenu/.cvsignore
index 8971fa14f5c..da121b4f91c 100644
--- a/htdocs/includes/treemenu/.cvsignore
+++ b/htdocs/includes/treemenu/.cvsignore
@@ -1,3 +1,4 @@
 docs
 imagesAlt
 imagesAlt2
+images
diff --git a/htdocs/includes/treemenu/images/base.gif b/htdocs/includes/treemenu/images/base.gif
deleted file mode 100644
index 9ac0b117b07..00000000000
Binary files a/htdocs/includes/treemenu/images/base.gif and /dev/null differ
diff --git a/htdocs/theme/common/treemenu/.cvsignore b/htdocs/theme/common/treemenu/.cvsignore
new file mode 100644
index 00000000000..020f3864407
--- /dev/null
+++ b/htdocs/theme/common/treemenu/.cvsignore
@@ -0,0 +1,2 @@
+*.db
+*.db
diff --git a/htdocs/includes/treemenu/images/branch.gif b/htdocs/theme/common/treemenu/branch.gif
similarity index 100%
rename from htdocs/includes/treemenu/images/branch.gif
rename to htdocs/theme/common/treemenu/branch.gif
diff --git a/htdocs/includes/treemenu/images/branchbottom.gif b/htdocs/theme/common/treemenu/branchbottom.gif
similarity index 100%
rename from htdocs/includes/treemenu/images/branchbottom.gif
rename to htdocs/theme/common/treemenu/branchbottom.gif
diff --git a/htdocs/includes/treemenu/images/branchtop.gif b/htdocs/theme/common/treemenu/branchtop.gif
similarity index 100%
rename from htdocs/includes/treemenu/images/branchtop.gif
rename to htdocs/theme/common/treemenu/branchtop.gif
diff --git a/htdocs/includes/treemenu/images/folder-expanded.gif b/htdocs/theme/common/treemenu/folder-expanded.gif
similarity index 100%
rename from htdocs/includes/treemenu/images/folder-expanded.gif
rename to htdocs/theme/common/treemenu/folder-expanded.gif
diff --git a/htdocs/includes/treemenu/images/folder.gif b/htdocs/theme/common/treemenu/folder.gif
similarity index 100%
rename from htdocs/includes/treemenu/images/folder.gif
rename to htdocs/theme/common/treemenu/folder.gif
diff --git a/htdocs/includes/treemenu/images/imgfolder.gif b/htdocs/theme/common/treemenu/imgfolder.gif
similarity index 100%
rename from htdocs/includes/treemenu/images/imgfolder.gif
rename to htdocs/theme/common/treemenu/imgfolder.gif
diff --git a/htdocs/includes/treemenu/images/line.gif b/htdocs/theme/common/treemenu/line.gif
similarity index 100%
rename from htdocs/includes/treemenu/images/line.gif
rename to htdocs/theme/common/treemenu/line.gif
diff --git a/htdocs/includes/treemenu/images/linebottom.gif b/htdocs/theme/common/treemenu/linebottom.gif
similarity index 100%
rename from htdocs/includes/treemenu/images/linebottom.gif
rename to htdocs/theme/common/treemenu/linebottom.gif
diff --git a/htdocs/includes/treemenu/images/minus.gif b/htdocs/theme/common/treemenu/minus.gif
similarity index 100%
rename from htdocs/includes/treemenu/images/minus.gif
rename to htdocs/theme/common/treemenu/minus.gif
diff --git a/htdocs/includes/treemenu/images/minusbottom.gif b/htdocs/theme/common/treemenu/minusbottom.gif
similarity index 100%
rename from htdocs/includes/treemenu/images/minusbottom.gif
rename to htdocs/theme/common/treemenu/minusbottom.gif
diff --git a/htdocs/includes/treemenu/images/minustop.gif b/htdocs/theme/common/treemenu/minustop.gif
similarity index 100%
rename from htdocs/includes/treemenu/images/minustop.gif
rename to htdocs/theme/common/treemenu/minustop.gif
diff --git a/htdocs/includes/treemenu/images/page.gif b/htdocs/theme/common/treemenu/page.gif
similarity index 100%
rename from htdocs/includes/treemenu/images/page.gif
rename to htdocs/theme/common/treemenu/page.gif
diff --git a/htdocs/includes/treemenu/images/plus.gif b/htdocs/theme/common/treemenu/plus.gif
similarity index 100%
rename from htdocs/includes/treemenu/images/plus.gif
rename to htdocs/theme/common/treemenu/plus.gif
diff --git a/htdocs/includes/treemenu/images/plusbottom.gif b/htdocs/theme/common/treemenu/plusbottom.gif
similarity index 100%
rename from htdocs/includes/treemenu/images/plusbottom.gif
rename to htdocs/theme/common/treemenu/plusbottom.gif
diff --git a/htdocs/includes/treemenu/images/plustop.gif b/htdocs/theme/common/treemenu/plustop.gif
similarity index 100%
rename from htdocs/includes/treemenu/images/plustop.gif
rename to htdocs/theme/common/treemenu/plustop.gif
diff --git a/htdocs/includes/treemenu/images/trash.gif b/htdocs/theme/common/treemenu/trash.gif
similarity index 100%
rename from htdocs/includes/treemenu/images/trash.gif
rename to htdocs/theme/common/treemenu/trash.gif
diff --git a/htdocs/includes/treemenu/images/.cvsignore b/htdocs/theme/common/window/alert/.cvsignore
similarity index 100%
rename from htdocs/includes/treemenu/images/.cvsignore
rename to htdocs/theme/common/window/alert/.cvsignore
diff --git a/htdocs/theme/common/window/alphacube/.cvsignore b/htdocs/theme/common/window/alphacube/.cvsignore
new file mode 100644
index 00000000000..a92ea3e3f61
--- /dev/null
+++ b/htdocs/theme/common/window/alphacube/.cvsignore
@@ -0,0 +1 @@
+*.db
diff --git a/htdocs/theme/common/window/default/.cvsignore b/htdocs/theme/common/window/default/.cvsignore
new file mode 100644
index 00000000000..a92ea3e3f61
--- /dev/null
+++ b/htdocs/theme/common/window/default/.cvsignore
@@ -0,0 +1 @@
+*.db