diff --git a/htdocs/admin/system/phpinfo.php b/htdocs/admin/system/phpinfo.php
index 5972894065e..f54dfd74521 100644
--- a/htdocs/admin/system/phpinfo.php
+++ b/htdocs/admin/system/phpinfo.php
@@ -105,37 +105,37 @@ $arrayphpminversionerror = array(5, 5, 0);
 $arrayphpminversionwarning = array(5, 6, 0);
 
 if (versioncompare(versionphparray(), $arrayphpminversionerror) < 0) {
-	print '<img src="'.$ErrorPicturePath.'" alt="Error"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror));
+	print img_picto('Error', 'error').' '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionerror));
 } elseif (versioncompare(versionphparray(), $arrayphpminversionwarning) < 0) {
-	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning));
+	print img_picto('Warning', 'warning').' '.$langs->trans("ErrorPHPVersionTooLow", versiontostring($arrayphpminversionwarning));
 } else {
-	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.versiontostring(versionphparray());
+	print img_picto('Ok', 'tick').' '.versiontostring(versionphparray());
 }
 
 print '</td></tr>';
 print '<tr><td>GET and POST support</td><td>';
 
 if (!isset($_GET["testget"]) && !isset($_POST["testpost"]) && !isset($_GET["mainmenu"])) {	// We must keep $_GET and $_POST here. This is a specific test.
-	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("PHPSupportPOSTGETKo");
+	print img_picto('Warning', 'warning').' '.$langs->trans("PHPSupportPOSTGETKo");
 	print ' (<a href="'.$_SERVER["PHP_SELF"].'?testget=ok">'.$langs->trans("Recheck").'</a>)';
 } else {
-	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportPOSTGETOk");
+	print img_picto('Ok', 'tick').' '.$langs->trans("PHPSupportPOSTGETOk");
 }
 
 print '</td></tr>';
 print '<tr><td>Sessions support</td><td>';
 if (!function_exists("session_id")) {
-	print '<img src="'.$ErrorPicturePath.'" alt="Error"> '.$langs->trans("ErrorPHPDoesNotSupportSessions");
+	print img_picto('Error', 'error').' '.$langs->trans("ErrorPHPDoesNotSupportSessions");
 } else {
-	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupportSessions");
+	print img_picto('Ok', 'tick').' '.$langs->trans("PHPSupportSessions");
 }
 print '</td></tr>';
 
 print '<tr><td>UTF-8 support</td><td>';
 if (!function_exists("utf8_encode")) {
-	print '<img src="'.$WarningPicturePath.'" alt="Warning"> '.$langs->trans("ErrorPHPDoesNotSupport", "UTF8");
+	print img_picto('Warning', 'warning').' '.$langs->trans("ErrorPHPDoesNotSupport", "UTF8");
 } else {
-	print '<img src="'.$OkayPicturePath.'" alt="Ok"> '.$langs->trans("PHPSupport", "UTF8");
+	print img_picto('Ok', 'tick').' '.$langs->trans("PHPSupport", "UTF8");
 }
 print '</td></tr>';
 
diff --git a/htdocs/admin/system/security.php b/htdocs/admin/system/security.php
index 279f85becae..ed033626fcd 100644
--- a/htdocs/admin/system/security.php
+++ b/htdocs/admin/system/security.php
@@ -293,6 +293,8 @@ if (file_exists($installlock)) {
 } else {
 	print img_warning().' '.$langs->trans("WarningLockFileDoesNotExists", DOL_DATA_ROOT);
 }
+
+print '<br>';
 print '<br>';
 
 // Is upgrade unlocked
@@ -301,6 +303,7 @@ if (file_exists($installlock)) {	// If install not locked, no need to show this.
 		print '<strong>'.$langs->trans("DolibarrUpgrade").'</strong>: ';
 		print img_warning().' '.$langs->trans("WarningUpgradeHasBeenUnlocked", $upgradeunlock);
 		print '<br>';
+		print '<br>';
 	}
 }
 
diff --git a/htdocs/categories/class/categorie.class.php b/htdocs/categories/class/categorie.class.php
index ae9bca3828e..4592adcd7e5 100644
--- a/htdocs/categories/class/categorie.class.php
+++ b/htdocs/categories/class/categorie.class.php
@@ -1260,7 +1260,7 @@ class Categorie extends CommonObject
 
 		dol_syslog(get_class($this)."::get_full_arbo dol_sort_array", LOG_DEBUG);
 
-		$this->cats = dol_sort_array($this->cats, 'fulllabel', 'asc', 1, 0, 1);
+		$this->cats = dol_sort_array($this->cats, 'fulllabel', 'asc', 1, 0, 1);		// Sort on full label like "Label 1 >> Sublabel a >> Subsublabel"
 
 		return $this->cats;
 	}