diff --git a/modules/lemonldap-ng-manager/example/skins/default/images/1downarrow_16x16.png b/modules/lemonldap-ng-manager/example/skins/default/images/1downarrow_16x16.png
new file mode 100644
index 000000000..256a03b6a
Binary files /dev/null and b/modules/lemonldap-ng-manager/example/skins/default/images/1downarrow_16x16.png differ
diff --git a/modules/lemonldap-ng-manager/example/skins/default/images/1rightarrow_16x16.png b/modules/lemonldap-ng-manager/example/skins/default/images/1rightarrow_16x16.png
new file mode 100644
index 000000000..2c629a62d
Binary files /dev/null and b/modules/lemonldap-ng-manager/example/skins/default/images/1rightarrow_16x16.png differ
diff --git a/modules/lemonldap-ng-manager/example/skins/default/manager.css b/modules/lemonldap-ng-manager/example/skins/default/manager.css
index 1a1e26679..78c1b55bc 100644
--- a/modules/lemonldap-ng-manager/example/skins/default/manager.css
+++ b/modules/lemonldap-ng-manager/example/skins/default/manager.css
@@ -111,6 +111,13 @@ input
 	cursor:pointer;
 }
 
+#help h1 img, #buttons h1 img, #edition h1 img
+{
+	vertical-align:bottom;
+	margin-bottom:2px;
+	margin-right:5px;
+}
+
 #help_content, #buttons_content, #content
 {
 	padding:5px 10px;
diff --git a/modules/lemonldap-ng-manager/example/skins/default/manager.js b/modules/lemonldap-ng-manager/example/skins/default/manager.js
index e3015c1ca..7efd261a0 100644
--- a/modules/lemonldap-ng-manager/example/skins/default/manager.js
+++ b/modules/lemonldap-ng-manager/example/skins/default/manager.js
@@ -12,12 +12,15 @@ if (treejquerycss.match('true')){ treejquerycss = true; } else { treejquerycss =
 $(document).ready(function(){
 	/* Display/hide divs */
 	$("#buttons h1").click(function(){
+		$('#buttons h1 img').toggle();
 		$("#buttons_content").slideToggle('fast');
 	});
 	$("#edition h1").click(function(){
+		$('#edition h1 img').toggle();
 		$("#content").slideToggle('fast');
 	});
 	$("#help h1").click(function(){
+		$('#help h1 img').toggle();
 		$("#help_content").slideToggle('fast');
 	});
 
@@ -281,6 +284,12 @@ function display(div,title) {
 	$('#newsamlmetadatab,#delsamlmetadatab').hide();
 	$('#newsamlattributeb,#delsamlattributeb').hide();
 	$('#newsamlattributebr').hide();
+	var height_cur=$('#buttons').height()+$('#edition').height()+$('#help').height();
+	var height_max=$('#menu').height();
+	if(height_cur > height_max || $('#help_content').is(':visible')==false){
+		$('#help h1 img').toggle();
+		$('#help_content').toggle();
+	}
 }
 function none(id) {
 	currentId=id;
diff --git a/modules/lemonldap-ng-manager/example/skins/default/manager.tpl b/modules/lemonldap-ng-manager/example/skins/default/manager.tpl
index 8f5ece79e..f85e5e8e2 100644
--- a/modules/lemonldap-ng-manager/example/skins/default/manager.tpl
+++ b/modules/lemonldap-ng-manager/example/skins/default/manager.tpl
@@ -63,6 +63,8 @@
    <div id="buttons" class="ui-corner-all">
 
     <h1 class="ui-widget-header ui-corner-all">
+     <img src="<TMPL_VAR NAME="DIR">/images/1downarrow_16x16.png" />
+     <img src="<TMPL_VAR NAME="DIR">/images/1rightarrow_16x16.png" class="hidden" />
      <lang en="Available actions" fr="Actions disponibles" />
     </h1>
 
@@ -130,8 +132,9 @@
    <form action="#" onsubmit="return false">
 
     <h1 class="ui-widget-header ui-corner-all">
-     <lang en="Edit key " fr="Édition de la clé " />
-     <span id="content_title">&nbsp;</span>
+     <img src="<TMPL_VAR NAME="DIR">/images/1downarrow_16x16.png" />
+     <img src="<TMPL_VAR NAME="DIR">/images/1rightarrow_16x16.png" class="hidden" />
+     <lang en="Edit key " fr="Édition de la clé " /><span id="content_title">&nbsp;</span>
     </h1>
 
 
@@ -358,7 +361,11 @@
 
 <!-- Help -->
 <div id="help" class="ui-corner-all">
-  <h1 class="ui-widget-header ui-corner-all"><lang en="Help" fr="Aide"/></h1>
+  <h1 class="ui-widget-header ui-corner-all">
+    <img src="<TMPL_VAR NAME="DIR">/images/1downarrow_16x16.png" />
+    <img src="<TMPL_VAR NAME="DIR">/images/1rightarrow_16x16.png" class="hidden" />
+    <lang en="Help" fr="Aide"/>
+  </h1>
 
   <div id="help_content" class="ui-widget-content ui-corner-all">
   <!-- AJAX content -->