diff --git a/htdocs/admin/tools/listevents.php b/htdocs/admin/tools/listevents.php
index a4d470bfe3f..5056c87d665 100644
--- a/htdocs/admin/tools/listevents.php
+++ b/htdocs/admin/tools/listevents.php
@@ -494,9 +494,9 @@ if ($result) {
 			$userstatic->email = $obj->email;
 
 			if (isModEnabled('multicompany') && $userstatic->admin && !$userstatic->entity) {
-				print img_picto($langs->trans("SuperAdministratorDesc"), 'redstar', 'class="valignmiddle paddingright"');
+				print img_picto($langs->trans("SuperAdministratorDesc"), 'superadmin', 'class="valignmiddle paddingright"');
 			} elseif ($userstatic->admin) {
-				print img_picto($langs->trans("AdministratorDesc"), 'star', 'class="valignmiddle paddingright"');
+				print img_picto($langs->trans("AdministratorDesc"), 'admin', 'class="valignmiddle paddingright"');
 			}
 
 			//print $userstatic->getLoginUrl(-1);
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index fe838f26194..8a6341ff4b1 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -5684,6 +5684,7 @@ function img_picto($titlealt, $picto, $moreatt = '', $pictoisfullpath = 0, $srco
 				'accounting_account' => 'infobox-bank_account',
 				'accountline' => 'infobox-bank_account',
 				'accountancy' => 'infobox-bank_account',
+				'admin'=> 'opacitymedium',
 				'asset' => 'infobox-bank_account',
 				'bank_account' => 'infobox-bank_account',
 				'bill' => 'infobox-commande',
@@ -5922,6 +5923,7 @@ function getImgPictoConv($mode = 'fa')
 			'add' => 'plus-circle',
 			'address' => 'address-book',
 			'ai' => 'magic',
+			'admin' => 'star',
 			'asset' => 'money-check-alt',
 			'autofill' => 'fill',
 			'back' => 'arrow-left',
@@ -5999,6 +6001,7 @@ function getImgPictoConv($mode = 'fa')
 			'group' => 'users',
 			'movement' => 'people-carry',
 			'sign-out' => 'sign-out-alt',
+			'superadmin' => 'star',
 			'switch_off' => 'toggle-off',
 			'switch_off_grey' => 'toggle-off',
 			'switch_off_warning' => 'toggle-off',
diff --git a/htdocs/hrm/skill_tab.php b/htdocs/hrm/skill_tab.php
index db729c5e4e8..948d00baa55 100644
--- a/htdocs/hrm/skill_tab.php
+++ b/htdocs/hrm/skill_tab.php
@@ -467,9 +467,9 @@ if ($object->id > 0 && (empty($action) || ($action != 'edit' && $action != 'crea
 			$addadmin = '';
 			if (property_exists($object, 'admin')) {
 				if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
-					$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"');
+					$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
 				} elseif (!empty($object->admin)) {
-					$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"');
+					$addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
 				}
 			}
 			print showValueWithClipboardCPButton(!empty($object->login) ? $object->login : '').$addadmin;
diff --git a/htdocs/install/check.php b/htdocs/install/check.php
index f52dff86e7a..c544e391e7f 100644
--- a/htdocs/install/check.php
+++ b/htdocs/install/check.php
@@ -448,8 +448,8 @@ if (!file_exists($conffile)) {
 
 		// Show title
 		if (getDolGlobalString('MAIN_VERSION_LAST_UPGRADE') || getDolGlobalString('MAIN_VERSION_LAST_INSTALL')) {
-			print $langs->trans("VersionLastUpgrade").' <b><span class="okinversed">'.getDolGlobalString('MAIN_VERSION_LAST_UPGRADE', getDolGlobalString('MAIN_VERSION_LAST_INSTALL')).'</span></b> &nbsp; - &nbsp; ';
-			print $langs->trans("VersionProgram").' <b><span class="okinversed">'.DOL_VERSION.'</span></b>';
+			print $langs->trans("VersionLastUpgrade").' <b><span class="badge-text badge-secondary okinversed">'.getDolGlobalString('MAIN_VERSION_LAST_UPGRADE', getDolGlobalString('MAIN_VERSION_LAST_INSTALL')).'</span></b> &nbsp; - &nbsp; ';
+			print $langs->trans("VersionProgram").' <b><span class="badge-text badge-secondary okinversed">'.DOL_VERSION.'</span></b>';
 			//print ' '.img_warning($langs->trans("RunningUpdateProcessMayBeRequired"));
 			print '<br>';
 			print '<br>';
@@ -472,18 +472,20 @@ if (!file_exists($conffile)) {
 
 		// Show line of first install choice
 		$choice  = '<tr class="trlineforchoice'.($foundrecommandedchoice ? ' choiceselected' : '').'">'."\n";
-		$choice .= '<td class="nowrap center"><b>'.$langs->trans("FreshInstall").'</b>';
+		$choice .= '<td class="nowrap center firstcolumn"><b>'.$langs->trans("FreshInstall").'</b>';
 		$choice .= '</td>';
 		$choice .= '<td class="listofchoicesdesc">';
 		$choice .= $langs->trans("FreshInstallDesc");
 		if (empty($dolibarr_main_db_host)) {	// This means install process was not run
 			$choice .= '<br>';
 			//print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE);
-			$choice .= '<div class="center"><div class="ok suggestedchoice">'.$langs->trans("InstallChoiceSuggested").'</div></div>';
+			$choice .= '<div class="><br>';
+			$choice .= '<div class="ok suggestedchoice">'.$langs->trans("InstallChoiceSuggested").'</div>';
+			$choice .= '</div>';
 		}
 
 		$choice .= '</td>';
-		$choice .= '<td class="center">';
+		$choice .= '<td class="center lastcolumn">';
 		if ($allowinstall) {
 			$choice .= '<a class="button" href="fileconf.php?selectlang='.$setuplang.'">'.$langs->trans("Start").'</a>';
 		} else {
@@ -535,8 +537,6 @@ if (!file_exists($conffile)) {
 
 		$count = 0;
 		foreach ($migrationscript as $migarray) {
-			$choice = '';
-
 			$count++;
 			$recommended_choice = false;
 			$version = DOL_VERSION;
@@ -568,16 +568,18 @@ if (!file_exists($conffile)) {
 				}
 			}
 
+			$choice = '';
+
 			$choice .= "\n".'<!-- choice '.$count.' -->'."\n";
 			$choice .= '<tr'.($recommended_choice ? ' class="choiceselected"' : '').'>';
-			$choice .= '<td class="nowrap center"><b>'.$langs->trans("Upgrade").'<br>'.$newversionfrom.$newversionfrombis.' -> '.$newversionto.'</b></td>';
+			$choice .= '<td class="nowrap center firstcolumn"><span class="opacitymedium">'.$langs->trans("Upgrade").'</span><br><b>'.$newversionfrom.$newversionfrombis.' -> '.$newversionto.'</b></td>';
 			$choice .= '<td class="listofchoicesdesc">';
 			$choice .= $langs->trans("UpgradeDesc");
 
 			if ($recommended_choice) {
 				$choice .= '<br>';
 				//print $langs->trans("InstallChoiceRecommanded",DOL_VERSION,$conf->global->MAIN_VERSION_LAST_UPGRADE);
-				$choice .= '<div class="center">';
+				$choice .= '<div class=""><br>';
 				$choice .= '<div class="ok suggestedchoice">'.$langs->trans("InstallChoiceSuggested").'</div>';
 				if ($count < count($migarray)) {	// There are other choices after
 					print $langs->trans("MigrateIsDoneStepByStep", DOL_VERSION);
@@ -586,7 +588,7 @@ if (!file_exists($conffile)) {
 			}
 
 			$choice .= '</td>';
-			$choice .= '<td class="center">';
+			$choice .= '<td class="center lastcolumn">';
 			if ($allowupgrade) {
 				$disabled = false;
 				if ($foundrecommandedchoice == 2) {
@@ -598,7 +600,15 @@ if (!file_exists($conffile)) {
 				if ($disabled) {
 					$choice .= '<span class="opacitymedium">'.$langs->trans("NotYetAvailable").'</span>';
 				} else {
-					$choice .= '<a class="button runupgrade" href="upgrade.php?action=upgrade'.($count < count($migrationscript) ? '_'.$versionto : '').'&amp;selectlang='.$setuplang.'&amp;versionfrom='.$versionfrom.'&amp;versionto='.$versionto.'">'.$langs->trans("Start").'</a>';
+					$choice .= '<a class="button runupgrade" href="upgrade.php?action=upgrade'.($count < count($migrationscript) ? '_'.$versionto : '').'&amp;selectlang='.$setuplang.'&amp;versionfrom='.$versionfrom.'&amp;versionto='.$versionto.'"';
+					if ($recommended_choice) {
+						$choice .= ' title="'.dol_string_nohtmltag($langs->trans("InstallChoiceSuggested")).'"';
+					} else {
+						$choice .= ' title="'.dol_string_nohtmltag($langs->trans("MigrationAlreadyDone")).'"';
+					}
+					$choice .= '>';
+					$choice .= $langs->trans("Start");
+					$choice .= '</a>';
 				}
 			} else {
 				$choice .= $langs->trans("NotAvailable");
@@ -606,7 +616,7 @@ if (!file_exists($conffile)) {
 			$choice .= '</td>';
 			$choice .= '</tr>'."\n";
 
-			if ($allowupgrade) {
+			if ($allowupgrade && $recommended_choice) {
 				$available_choices[$count] = $choice;
 			} else {
 				$notavailable_choices[$count] = $choice;
@@ -636,7 +646,7 @@ if (!file_exists($conffile)) {
 
 			print '<div id="navail_choices" style="display:none">';
 			print "<br>\n";
-			print '<table width="100%" class="listofchoices">';
+			print '<table class="centpercent listofchoices">';
 			foreach ($notavailable_choices as $choice) {
 				print $choice;
 			}
diff --git a/htdocs/install/default.css b/htdocs/install/default.css
index 5ee3379e66e..2584952f24a 100644
--- a/htdocs/install/default.css
+++ b/htdocs/install/default.css
@@ -437,14 +437,14 @@ a.button:hover {
 }
 
 .suggestedchoice {
-	color: rgba(70, 3, 62, 0.6) !important;
+	/* color: rgba(70, 3, 62, 0.6) !important;
     /* background-color: rgba(70, 3, 62, 0.3); */
-    padding: 2px 4px;
+    padding: 2px 0px 2px 0px;
     border-radius: 4px;
     /* white-space: nowrap; */
 }
 .choiceselected {
-	background-color: #f4f6f4;
+	/* background-color: #f4f6f4; */
 	background-repeat: repeat-x;
 	background-position: top left;
 }
@@ -477,6 +477,23 @@ img.pictofixedwidth {
 }
 
 
+.badge-secondary, .tabs .badge {
+    color: #fff !important;
+    background-color: #aaaabb !important;
+}
+.badge-text {
+    padding: 3px;
+    padding-left: 5px;
+    padding-right: 5px;
+    border-radius: 5px;
+}
+
+td.firstcolumn {
+    width: 150px;
+}
+td.lastcolumn {
+    width: 150px;
+}
 
 /* Force values for small screen 570 */
 @media only screen and (max-width: 570px)
diff --git a/htdocs/langs/en_US/install.lang b/htdocs/langs/en_US/install.lang
index 14b112ab90d..2dfcf17fc34 100644
--- a/htdocs/langs/en_US/install.lang
+++ b/htdocs/langs/en_US/install.lang
@@ -203,8 +203,8 @@ MigrationReloadModule=Reload module %s
 MigrationResetBlockedLog=Reset module BlockedLog for v7 algorithm
 MigrationImportOrExportProfiles=Migration of import or export profiles (%s)
 MigrationHolidayPath=Migration of file paths for holidays
-ShowNotAvailableOptions=Show unavailable options
-HideNotAvailableOptions=Hide unavailable options
+ShowNotAvailableOptions=Show unavailable or not recommended options
+HideNotAvailableOptions=Hide unavailable or not recommended options
 ErrorFoundDuringMigration=Error(s) were reported during the migration process so next step is not available. To ignore errors, you can <a href="%s">click here</a>, but the application or some features may not work correctly until the errors are resolved.
 YouTryInstallDisabledByDirLock=The install/upgrade pages have been disabled for security (directory renamed with .lock suffix).<br>
 YouTryInstallDisabledByFileLock=The install/upgrade pages have been disabled for security (by the existence of a lock file <strong>install.lock</strong> in the dolibarr documents directory).<br>
@@ -223,3 +223,4 @@ InvoiceExportModelsMigration=Migrate invoice export models
 MigrationApiRestTokens=Migrate user's API keys to llx_oauth_token
 MigratedTokens=%s token(s) migrated
 InitAHMACKeyForBlockedLog=Init the BLOCKEDLOG_HMAC_KEY constant for new encryption of Unalterable Log module
+MigrationAlreadyDone=This migration appears to have already been completed.
diff --git a/htdocs/theme/eldy/global.inc.php b/htdocs/theme/eldy/global.inc.php
index 664a263d85f..60fce9d0bde 100644
--- a/htdocs/theme/eldy/global.inc.php
+++ b/htdocs/theme/eldy/global.inc.php
@@ -5504,7 +5504,7 @@ img.boxhandle, img.boxclose {
 	transition: color 0.4s;
 }
 .star:hover, .star.active {
-	color: <?php echo $badgeWarning ?>;
+	color: var(--butactionbg);
 }
 
 .search-component-assistance {
@@ -7295,7 +7295,7 @@ div.dataTables_length select {
 /*  Select2                                                                       */
 /* ============================================================================== */
 
-.heightofcombo {
+.heightofcombo:not(.pageplusone) {
 	height: 28px;
 }
 .select2-container .select2-selection--single {
diff --git a/htdocs/theme/md/dropdown.inc.php b/htdocs/theme/md/dropdown.inc.php
index 876497c340d..9351c2fb972 100644
--- a/htdocs/theme/md/dropdown.inc.php
+++ b/htdocs/theme/md/dropdown.inc.php
@@ -304,14 +304,17 @@ a.top-menu-dropdown-link {
 
 
 .dropdown-menu > .user-body, .dropdown-body{
-	padding: 15px;
+	/* padding: 15px; */
 	border-bottom: 1px solid #f4f4f4;
 	border-top: 1px solid #f0f0f0;
 	white-space: normal;
 }
+#top-bookmark-search-nothing-found {
+	padding: 15px;
+	display: block;
+}
 
 .dropdown-menu > .bookmark-body, .dropdown-body{
-	padding: 10px 0;
 	overflow-y: auto;
 	max-height: 60vh ; /* fallback for browsers without support for calc() */
 	max-height: calc(90vh - 110px) ;
@@ -368,6 +371,8 @@ a.dropdown-item {
 	text-align: start;
 }
 .dropdown-item.bookmark-item {
+	padding-top: 10px;
+	padding-bottom: 10px;
 	padding-left: 14px;
 	padding-right: 14px;
 }
diff --git a/htdocs/theme/md/style.css.php b/htdocs/theme/md/style.css.php
index efa8ee4c9dc..2b76fb689ae 100644
--- a/htdocs/theme/md/style.css.php
+++ b/htdocs/theme/md/style.css.php
@@ -3993,7 +3993,7 @@ div.blockvmenusearch, div.blockvmenubookmarks
 	text-decoration: none;
 	padding-left: 5px;
 	padding-right: 1px;
-	padding-top: 3px;
+	padding-top: 8px;
 	padding-bottom: 3px;
 	margin: 1px 0px 2px 0px;
 	background: var(--colorbackvmenu1);
@@ -5432,7 +5432,7 @@ img.boxhandle, img.boxclose {
 	transition: color 0.4s;
 }
 .star:hover, .star.active {
-	color: <?php echo $badgeWarning ?>;
+	color: var(--butactionbg);
 }
 
 .search-component-assistance {
diff --git a/htdocs/user/agenda_extsites.php b/htdocs/user/agenda_extsites.php
index 470ed284fca..f5f7e1418d0 100644
--- a/htdocs/user/agenda_extsites.php
+++ b/htdocs/user/agenda_extsites.php
@@ -209,9 +209,9 @@ if (!empty($object->ldap_sid) && $object->status == 0) {
 	print '<td>';
 	$addadmin = '';
 	if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
-		$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"');
+		$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
 	} elseif (!empty($object->admin)) {
-		$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"');
+		$addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
 	}
 	print showValueWithClipboardCPButton($object->login).$addadmin;
 	print '</td>';
diff --git a/htdocs/user/api_token/card.php b/htdocs/user/api_token/card.php
index 8ee28e8c664..16fb4033b49 100644
--- a/htdocs/user/api_token/card.php
+++ b/htdocs/user/api_token/card.php
@@ -304,9 +304,9 @@ if ($action == 'create') {
 		$addadmin = '';
 		if (property_exists($object, 'admin')) {
 			if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
-				$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"');
+				$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
 			} elseif (!empty($object->admin)) {
-				$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"');
+				$addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
 			}
 		}
 		print showValueWithClipboardCPButton($object->login).$addadmin;
diff --git a/htdocs/user/bank.php b/htdocs/user/bank.php
index eb7de0a4b65..48bcb3eb5f5 100644
--- a/htdocs/user/bank.php
+++ b/htdocs/user/bank.php
@@ -396,9 +396,9 @@ if ($action != 'edit' && $action != 'create') {		// If not bank account yet, $ac
 		$addadmin = '';
 		if (property_exists($object, 'admin')) {
 			if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
-				$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"');
+				$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
 			} elseif (!empty($object->admin)) {
-				$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"');
+				$addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
 			}
 		}
 		print showValueWithClipboardCPButton($object->login).$addadmin;
diff --git a/htdocs/user/card.php b/htdocs/user/card.php
index 7af69426cf8..608599b2ebb 100644
--- a/htdocs/user/card.php
+++ b/htdocs/user/card.php
@@ -1676,9 +1676,9 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print '<td>';
 				$addadmin = '';
 				if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
-					$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"');
+					$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
 				} elseif (!empty($object->admin)) {
-					$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"');
+					$addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
 				}
 				print showValueWithClipboardCPButton($object->login).$addadmin;
 				print '</td>';
@@ -1801,7 +1801,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print $form->textwithpicto($text, $langs->trans("THMDescription"), 1, 'help', 'classthm');
 				print '</td>';
 				print '<td>';
-				print($object->thm != '' ? price($object->thm, 0, $langs, 1, -1, -1, $conf->currency) : '');
+				print($object->thm != '' ? '<span class="amount">'.price($object->thm, 0, $langs, 1, -1, -1, $conf->currency).'</span>' : '');
 				print '</td>';
 				print "</tr>\n";
 
@@ -1811,7 +1811,7 @@ if ($action == 'create' || $action == 'adduserldap') {
 				print $form->textwithpicto($text, $langs->trans("TJMDescription"), 1, 'help', 'classtjm');
 				print '</td>';
 				print '<td>';
-				print($object->tjm != '' ? price($object->tjm, 0, $langs, 1, -1, -1, $conf->currency) : '');
+				print($object->tjm != '' ? '<span class="amount">'.price($object->tjm, 0, $langs, 1, -1, -1, $conf->currency).'</span>' : '');
 				print '</td>';
 				print "</tr>\n";
 			}
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
index 6ba5c02c681..93a0a844303 100644
--- a/htdocs/user/class/user.class.php
+++ b/htdocs/user/class/user.class.php
@@ -3390,9 +3390,9 @@ class User extends CommonObject
 		$return .= '<div class="info-box-content">';
 		$return .= '<span class="info-box-ref inline-block tdoverflowmax150 valignmiddle">'.(method_exists($this, 'getNomUrl') ? $this->getNomUrl(0, '', 0, 0, 24, 0, '', 'valignmiddle') : $this->ref);
 		if (isModEnabled('multicompany') && $this->admin && !$this->entity) {
-			$return .= img_picto($langs->trans("SuperAdministratorDesc"), 'redstar', 'class="valignmiddle paddingright paddingleft"');
+			$return .= img_picto($langs->trans("SuperAdministratorDesc"), 'superadmin', 'class="valignmiddle paddingright paddingleft"');
 		} elseif ($this->admin) {
-			$return .= img_picto($langs->trans("AdministratorDesc"), 'star', 'class="valignmiddle paddingright paddingleft"');
+			$return .= img_picto($langs->trans("AdministratorDesc"), 'admin', 'class="valignmiddle paddingright paddingleft"');
 		}
 		$return .= '</span>';
 		if ($selected >= 0) {
diff --git a/htdocs/user/document.php b/htdocs/user/document.php
index 39563ac142a..915259c18d4 100644
--- a/htdocs/user/document.php
+++ b/htdocs/user/document.php
@@ -196,9 +196,9 @@ if ($object->id && $upload_dir !== null) {
 		print '<td>';
 		$addadmin = '';
 		if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
-			$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"');
+			$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
 		} elseif (!empty($object->admin)) {
-			$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"');
+			$addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
 		}
 		print showValueWithClipboardCPButton($object->login).$addadmin;
 		print '</td>';
diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php
index 0b61b4146f7..b74f16a7967 100644
--- a/htdocs/user/group/card.php
+++ b/htdocs/user/group/card.php
@@ -349,7 +349,7 @@ if ($action == 'create') {
 				print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
 				print '<td class="valeur">'.dol_escape_htmltag($object->name);
 				if (empty($object->entity)) {
-					print img_picto($langs->trans("GlobalGroup"), 'redstar');
+					print img_picto($langs->trans("GlobalGroup"), 'superadmin');
 				}
 				print "</td></tr>\n";
 			}
@@ -467,9 +467,9 @@ if ($action == 'create') {
 						print '<td class="tdoverflowmax150">';
 						print $useringroup->getNomUrl(-1, '', 0, 0, 24, 0, 'login');
 						if (isModEnabled('multicompany') && $useringroup->admin && empty($useringroup->entity)) {
-							print img_picto($langs->trans("SuperAdministratorDesc"), 'redstar', 'class="valignmiddle paddingright paddingleft"');
+							print img_picto($langs->trans("SuperAdministratorDesc"), 'superadmin', 'class="valignmiddle paddingright paddingleft"');
 						} elseif ($useringroup->admin) {
-							print img_picto($langs->trans("AdministratorDesc"), 'star', 'class="valignmiddle paddingright paddingleft"');
+							print img_picto($langs->trans("AdministratorDesc"), 'admin', 'class="valignmiddle paddingright paddingleft"');
 						}
 						print '</td>';
 						print '<td>'.$useringroup->lastname.'</td>';
diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php
index e2fa073d9ac..0518fe7c26e 100644
--- a/htdocs/user/group/ldap.php
+++ b/htdocs/user/group/ldap.php
@@ -123,7 +123,7 @@ if (isModEnabled('multicompany')) {
 	print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
 	print '<td class="valeur">'.$object->name;
 	if (!$object->entity) {
-		print img_picto($langs->trans("GlobalGroup"), 'redstar');
+		print img_picto($langs->trans("GlobalGroup"), 'superadmin');
 	}
 	print "</td></tr>\n";
 }
diff --git a/htdocs/user/group/list.php b/htdocs/user/group/list.php
index eed895bc131..edc3d0a2f24 100644
--- a/htdocs/user/group/list.php
+++ b/htdocs/user/group/list.php
@@ -469,7 +469,7 @@ while ($i < $imaxinloop) {
 		print '<td class="tdoverflowmax200">';
 		print $object->getNomUrl(1);
 		if (isModEnabled('multicompany') && !$obj->entity) {
-			print img_picto($langs->trans("GlobalGroup"), 'redstar');
+			print img_picto($langs->trans("GlobalGroup"), 'superadmin');
 		}
 		print "</td>";
 		if (!$i) {
diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php
index 36156dfd606..4f8a6e56c9c 100644
--- a/htdocs/user/group/perms.php
+++ b/htdocs/user/group/perms.php
@@ -239,7 +239,7 @@ if ($object->id > 0) {
 		print '<tr><td class="titlefield">'.$langs->trans("Name").'</td>';
 		print '<td class="valeur">'.dol_escape_htmltag($object->name);
 		if (empty($object->entity)) {
-			print img_picto($langs->trans("GlobalGroup"), 'redstar');
+			print img_picto($langs->trans("GlobalGroup"), 'superadmin');
 		}
 		print "</td></tr>\n";
 	}
diff --git a/htdocs/user/hierarchy.php b/htdocs/user/hierarchy.php
index 74ec7bdabe9..cd98b2a87db 100644
--- a/htdocs/user/hierarchy.php
+++ b/htdocs/user/hierarchy.php
@@ -176,9 +176,9 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 
 		$li = $userstatic->getNomUrl(-1, '', 0, 1);
 		if (isModEnabled('multicompany') && $userstatic->admin && !$userstatic->entity) {
-			$li .= img_picto($langs->trans("SuperAdministratorDesc"), 'redstar', 'class="valignmiddle paddingright paddingleft"');
+			$li .= img_picto($langs->trans("SuperAdministratorDesc"), 'superadmin', 'class="valignmiddle paddingright paddingleft"');
 		} elseif ($userstatic->admin) {
-			$li .= img_picto($langs->trans("AdministratorDesc"), 'star', 'class="valignmiddle paddingright paddingleft"');
+			$li .= img_picto($langs->trans("AdministratorDesc"), 'admin', 'class="valignmiddle paddingright paddingleft"');
 		}
 		$li .= ' <span class="opacitymedium">('.$val['login'].($entitystring ? ' - '.$entitystring : '').')</span>';
 
@@ -233,9 +233,9 @@ if (!is_array($user_arbo) && $user_arbo < 0) {
 					$li = '<span class="opacitymedium">';
 					$li .= $userstatic->getNomUrl(-1, '', 0, 1);
 					if (isModEnabled('multicompany') && $userstatic->admin && !$userstatic->entity) {
-						$li .= img_picto($langs->trans("SuperAdministrator"), 'redstar');
+						$li .= img_picto($langs->trans("SuperAdministrator"), 'superadmin');
 					} elseif ($userstatic->admin) {
-						$li .= img_picto($langs->trans("Administrator"), 'star');
+						$li .= img_picto($langs->trans("Administrator"), 'admin');
 					}
 					$li .= ' <span class="opacitymedium">('.$val['login'].($entitystring ? ' - '.$entitystring : '').')</span>';
 					$li .= ' - <span class="opacitymedium">'.$langs->trans("ExcludedByFilter").'</span>';
diff --git a/htdocs/user/home.php b/htdocs/user/home.php
index 33a89c37c79..d7818d2c782 100644
--- a/htdocs/user/home.php
+++ b/htdocs/user/home.php
@@ -189,9 +189,9 @@ if ($resql) {
 		$lastcreatedbox .= '<td class="nowraponall tdoverflowmax150">';
 		$lastcreatedbox .= $fuserstatic->getNomUrl(-1);
 		if (isModEnabled('multicompany') && $obj->admin && !$obj->entity) {
-			$lastcreatedbox .= img_picto($langs->trans("SuperAdministratorDesc"), 'redstar');
+			$lastcreatedbox .= img_picto($langs->trans("SuperAdministratorDesc"), 'superadmin');
 		} elseif ($obj->admin) {
-			$lastcreatedbox .= img_picto($langs->trans("AdministratorDesc"), 'star');
+			$lastcreatedbox .= img_picto($langs->trans("AdministratorDesc"), 'admin');
 		}
 		$lastcreatedbox .= "</td>";
 		$lastcreatedbox .= '<td class="tdoverflowmax150" title="'.dol_escape_htmltag($obj->login).'">'.dol_escape_htmltag($obj->login).'</td>';
@@ -287,7 +287,7 @@ if ($permissiontoreadgroup) {
 			$lastgroupbox .= '<td>';
 			$lastgroupbox .= $grouptemp->getNomUrl(1);
 			if (!$obj->entity) {
-				$lastgroupbox .= img_picto($langs->trans("GlobalGroup"), 'redstar');
+				$lastgroupbox .= img_picto($langs->trans("GlobalGroup"), 'superadmin');
 			}
 			$lastgroupbox .= "</td>";
 			if (isModEnabled('multicompany') && is_object($mc)) {
diff --git a/htdocs/user/list.php b/htdocs/user/list.php
index 0f780c8a89f..605803e3120 100644
--- a/htdocs/user/list.php
+++ b/htdocs/user/list.php
@@ -1120,9 +1120,9 @@ while ($i < $imaxinloop) {
 			print '<td class="nowraponall tdoverflowmax150">';
 			print $li;
 			if (isModEnabled('multicompany') && $obj->admin && !$obj->entity) {
-				print img_picto($langs->trans("SuperAdministratorDesc"), 'redstar', 'class="valignmiddle paddingright paddingleft"');
+				print img_picto($langs->trans("SuperAdministratorDesc"), 'superadmin', 'class="valignmiddle paddingright paddingleft"');
 			} elseif ($obj->admin) {
-				print img_picto($langs->trans("AdministratorDesc"), 'star', 'class="valignmiddle paddingright paddingleft"');
+				print img_picto($langs->trans("AdministratorDesc"), 'admin', 'class="valignmiddle paddingright paddingleft"');
 			}
 			print '</td>';
 			if (!$i) {
@@ -1194,9 +1194,9 @@ while ($i < $imaxinloop) {
 				$user2->statut = $obj->status2;
 				$user2->status = $obj->status2;
 				if (isModEnabled('multicompany') && $obj->admin2 && !$obj->entity2) {
-					print img_picto($langs->trans("SuperAdministratorDesc"), 'redstar', 'class="valignmiddle paddingright"');
+					print img_picto($langs->trans("SuperAdministratorDesc"), 'superadmin', 'class="valignmiddle paddingright"');
 				} elseif ($obj->admin2) {
-					print img_picto($langs->trans("AdministratorDesc"), 'star', 'class="valignmiddle paddingright"');
+					print img_picto($langs->trans("AdministratorDesc"), 'admin', 'class="valignmiddle paddingright"');
 				}
 				print $user2->getNomUrl(-1, '', 0, 0, 24, 0, '', '', 1);
 			}
diff --git a/htdocs/user/note.php b/htdocs/user/note.php
index 6f8ec6e9179..90ff138efd0 100644
--- a/htdocs/user/note.php
+++ b/htdocs/user/note.php
@@ -134,9 +134,9 @@ if ($id) {
 		print '<td>';
 		$addadmin = '';
 		if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
-			$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"');
+			$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
 		} elseif (!empty($object->admin)) {
-			$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"');
+			$addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
 		}
 		print showValueWithClipboardCPButton($object->login).$addadmin;
 		print '</td>';
diff --git a/htdocs/user/notify/card.php b/htdocs/user/notify/card.php
index 17a4ffdc24f..14742c13239 100644
--- a/htdocs/user/notify/card.php
+++ b/htdocs/user/notify/card.php
@@ -195,9 +195,9 @@ if ($result > 0) {
 		$addadmin = '';
 		if (property_exists($object, 'admin')) {
 			if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
-				$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"');
+				$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
 			} elseif (!empty($object->admin)) {
-				$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"');
+				$addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
 			}
 		}
 		print showValueWithClipboardCPButton($object->login).$addadmin;
diff --git a/htdocs/user/param_ihm.php b/htdocs/user/param_ihm.php
index c1313a3779d..c6f7304feff 100644
--- a/htdocs/user/param_ihm.php
+++ b/htdocs/user/param_ihm.php
@@ -27,11 +27,6 @@
 
 // Load Dolibarr environment
 require '../main.inc.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
-
 /**
  * @var Conf $conf
  * @var DoliDB $db
@@ -39,6 +34,10 @@ require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
  * @var Translate $langs
  * @var User $user
  */
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/usergroups.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/class/html.formadmin.class.php';
 
 // Load translation files required by page
 $langs->loadLangs(array('companies', 'products', 'admin', 'users', 'languages', 'projects', 'members'));
@@ -357,9 +356,9 @@ if ($action == 'edit') {
 		print '<td>';
 		$addadmin = '';
 		if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
-			$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"');
+			$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
 		} elseif (!empty($object->admin)) {
-			$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"');
+			$addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
 		}
 		print showValueWithClipboardCPButton($object->login).$addadmin;
 		print '</td>';
@@ -524,9 +523,9 @@ if ($action == 'edit') {
 		print '<td>';
 		$addadmin = '';
 		if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
-			$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"');
+			$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
 		} elseif (!empty($object->admin)) {
-			$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"');
+			$addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
 		}
 		print showValueWithClipboardCPButton($object->login).$addadmin;
 		print '</td>';
diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php
index fe728e3fc6a..b8630f53739 100644
--- a/htdocs/user/perms.php
+++ b/htdocs/user/perms.php
@@ -379,9 +379,9 @@ if (!empty($object->ldap_sid) && $object->status == 0) {
 	print '<td>';
 	$addadmin = '';
 	if (isModEnabled('multicompany') && !empty($object->admin) && empty($object->entity)) {
-		$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "redstar", 'class="paddingleft valignmiddle"');
+		$addadmin .= img_picto($langs->trans("SuperAdministratorDesc"), "superadmin", 'class="paddingleft valignmiddle"');
 	} elseif (!empty($object->admin)) {
-		$addadmin .= img_picto($langs->trans("AdministratorDesc"), "star", 'class="paddingleft valignmiddle"');
+		$addadmin .= img_picto($langs->trans("AdministratorDesc"), "admin", 'class="paddingleft valignmiddle"');
 	}
 	print showValueWithClipboardCPButton($object->login).$addadmin;
 	print '</td>';
@@ -657,7 +657,7 @@ foreach ($arrayofpermission as $i => $obj) {
 		print '<!-- perm is a perm allowed to any admin -->';
 		if ($caneditperms) {
 			print '<td class="center nowrap">';
-			print img_picto($langs->trans("AdministratorDesc"), 'star', 'class="paddingleft valignmiddle"');
+			print img_picto($langs->trans("AdministratorDesc"), 'admin', 'class="paddingleft valignmiddle"');
 			print '</td>';
 		} else {
 			print '<td class="center nowrap">';