diff --git a/htdocs/admin/tools/ui/class/documentation.class.php b/htdocs/admin/tools/ui/class/documentation.class.php
index e72262eb3b3..7608ef0a147 100644
--- a/htdocs/admin/tools/ui/class/documentation.class.php
+++ b/htdocs/admin/tools/ui/class/documentation.class.php
@@ -403,7 +403,7 @@ class Documentation
 	{
 		$i = 0;
 		$menu_entry = [];
-		if (!empty($this->view)) :
+		if (!empty($this->view)) {
 			// On se place au bon niveau
 			foreach ($this->view as $view) {
 				$i++;
@@ -413,11 +413,11 @@ class Documentation
 					$menu_entry = $menu_entry['submenu'][$view];
 				}
 			}
-		endif;
+		}
 
-		if (!empty($menu_entry['summary']) || !empty($menu_entry['submenu'] && $showsubmenu)) {
+		if (!empty($menu_entry['summary']) || (!empty($menu_entry['submenu']) && $showsubmenu)) {
 			print '<div class="summary-wrapper">';
-				$this->displaySummary($menu_entry);
+			$this->displaySummary($menu_entry);
 			print '</div>';
 		}
 	}
@@ -440,15 +440,22 @@ class Documentation
 		$level++;
 		print '<ul class="documentation-summary level-'.$level.'"">';
 
-		if (!empty($menu['summary'])) :
+		if (!empty($menu['summary'])) {
 			foreach ($menu['summary'] as $summary_label => $summary_link) {
 				if ($summary_link[0] == '#') {
-					$summary_link = $menu['url'].$summary_link;
+					$tmp_summary_link = $menu['url'];
+					if (GETPOSTINT('hidenavmenu')) {
+						$tmp_summary_link .= '&hidenavmenu=1';
+					}
+					if (GETPOSTINT('displayMode')) {
+						$tmp_summary_link .= '&displayMode=1';
+					}
+					$tmp_summary_link;
 				}
 
 				print '<li><a href="'.$summary_link.'">'.$langs->trans($summary_label).'</a></li>';
 			}
-		endif;
+		}
 
 		if ($showsubmenu && !empty($menu['submenu'])) {
 			foreach ($menu['submenu'] as $key => $item) {
diff --git a/htdocs/admin/tools/ui/components/icons.php b/htdocs/admin/tools/ui/components/icons.php
index 89edcaae12e..3aa03eea9d7 100644
--- a/htdocs/admin/tools/ui/components/icons.php
+++ b/htdocs/admin/tools/ui/components/icons.php
@@ -112,7 +112,11 @@ if (!GETPOST('hidenavmenu')) {
 				); ?>
 
 				<div class="right">
-					<?php print dolGetButtonTitle($revertDisplayName, '', $switchDisplayLinkIcon, $switchDisplayLink.'#img-picto-section-list', '', 1, ['forcenohideoftext'=>1]); ?>
+					<?php
+					if ($displayMode != 'icon-only') {
+						print dolGetButtonTitle($revertDisplayName, '', $switchDisplayLinkIcon, $switchDisplayLink.'#img-picto-section-list', '', 1, ['forcenohideoftext'=>1]);
+					}
+					?>
 				</div>
 
 				<div class="documentation-example">
@@ -142,7 +146,7 @@ if (!GETPOST('hidenavmenu')) {
 								</div>';
 							} else {
 								$tooltip = '<u>'.$langs->trans("DocCodeForMenuOrModuleBuilder").':</u><br>'.$iconName;
-								$tooltip .= '<br><u>'.$langs->trans("DocExampleForPHPCode").':</u><br>img_picto(\''.$labelAlt.'\', \''.$iconName.'\')';
+								$tooltip .= '<br><br><u>'.$langs->trans("DocExampleForPHPCode").':</u><br>img_picto(\''.$labelAlt.'\', \''.$iconName.'\')';
 								$iconCode = img_picto($tooltip, $iconName, '', 0, 0, 0, '', 'classfortooltip');
 								print '<span class="doc-icon-list-item">'.$iconCode;
 								print '<span class="doc-icon-hidden-name-for-search">'.$iconName.'</span></span>';
@@ -189,7 +193,11 @@ if (!GETPOST('hidenavmenu')) {
 				); ?>
 
 				<div class="right">
-					<?php print dolGetButtonTitle($revertDisplayName, '', $switchDisplayLinkIcon, $switchDisplayLink.'#icon-section-list', '', 1, ['forcenohideoftext'=>1]); ?>
+					<?php
+					if ($displayMode != 'icon-only') {
+						print dolGetButtonTitle($revertDisplayName, '', $switchDisplayLinkIcon, $switchDisplayLink.'#icon-section-list', '', 1, ['forcenohideoftext'=>1]);
+					}
+					?>
 				</div>
 
 				<div class="documentation-example">
diff --git a/htdocs/modulebuilder/index.php b/htdocs/modulebuilder/index.php
index 7fe6b473e1f..ca5816eea3e 100644
--- a/htdocs/modulebuilder/index.php
+++ b/htdocs/modulebuilder/index.php
@@ -4036,7 +4036,14 @@ if ($module == 'initmodule') {
 				print '<span class="opacitymedium">'.$langs->trans("Picto").'</span> &nbsp; ';
 				print '</div><div class="tagtd">';
 				print '<input type="text" name="idpicto" value="fa-file" placeholder="'.dol_escape_htmltag($langs->trans("Picto")).'">';
+
 				print $form->textwithpicto('', $langs->trans("Example").': fa-file, fa-globe, ... any font awesome code.<br>Advanced syntax is fa-fakey[_faprefix[_facolor[_fasize]]]');
+
+				print '<span class="opacitymedium small">';
+				print ' &nbsp; &nbsp; ';
+				print dolButtonToOpenUrlInDialogPopup('popup_picto_id', $langs->transnoentitiesnoconv("DocIconsList"), $langs->transnoentitiesnoconv("DocIconsList"), '/admin/tools/ui/components/icons.php?hidenavmenu=1&displayMode=icon-only#img-picto-section-list', '', '');
+				print '</span>';
+
 				print '</div></div>';
 
 				print '<div class="tagtr"><div class="tagtd">';