diff --git a/css/setup.css b/css/setup.css
index ad8eac6b4..37d8feddc 100644
--- a/css/setup.css
+++ b/css/setup.css
@@ -1291,7 +1291,7 @@ ul.cke_autocomplete_panel, .ibo-quick-create--input.selectize-control.single .se
 .ibo-is-fullwidth {
   width: 100%;
 }
-ul.cke_autocomplete_panel .ibo-vendors-ckeditor--autocomplete-item-image, .ibo-panel--header-left, .ibo-panel--icon, .ibo-dashlet-header-static--icon-container, .ibo-input-image--image-view, .ibo-pill, .ibo-title--icon, .ibo-datatable--toolbar-left, .ibo-datatable--toolbar-right, .ibo-field--fullscreen-toggler, .ibo-navigation-menu--bottom-part, .ibo-navigation-menu--user-info, .ibo-navigation-menu--user-info .ibo-navigation-menu--user-picture, .ibo-tab-container--tab-toggler, .ibo-tab-container--extra-tabs-list-toggler, .ibo-object-details--status-dot, .ibo-activity-panel--togglers, .ibo-activity-panel--tabs-togglers, .ibo-activity-panel--tab-title, .ibo-activity-panel--tab-toolbar-actions, .ibo-activity-panel--tab-toolbar-action, .ibo-activity-panel--body--placeholder-image, .ibo-activity-panel--body--placeholder-hint, .ibo-activity-panel--closed-cover, .ibo-caselog-entry-form--lock-icon, .ibo-activity-entry--medallion, .ibo-activity-panel--load-more-entries-container, .ibo-activity-panel--load-entries-button {
+ul.cke_autocomplete_panel .ibo-vendors-ckeditor--autocomplete-item-image, .ibo-panel--header-left, .ibo-panel--icon, .ibo-dashlet-header-static--icon-container, .ibo-input-image--image-view, .ibo-select--autocomplete-item-image, .ibo-pill, .ibo-title--icon, .ibo-datatable--toolbar-left, .ibo-datatable--toolbar-right, .ibo-field--fullscreen-toggler, .ibo-navigation-menu--bottom-part, .ibo-navigation-menu--user-info, .ibo-navigation-menu--user-info .ibo-navigation-menu--user-picture, .ibo-tab-container--tab-toggler, .ibo-tab-container--extra-tabs-list-toggler, .ibo-object-details--status-dot, .ibo-activity-panel--togglers, .ibo-activity-panel--tabs-togglers, .ibo-activity-panel--tab-title, .ibo-activity-panel--tab-toolbar-actions, .ibo-activity-panel--tab-toolbar-action, .ibo-activity-panel--body--placeholder-image, .ibo-activity-panel--body--placeholder-hint, .ibo-activity-panel--closed-cover, .ibo-caselog-entry-form--lock-icon, .ibo-activity-entry--medallion, .ibo-activity-panel--load-more-entries-container, .ibo-activity-panel--load-entries-button {
   display: flex;
   justify-content: center;
   align-items: center;
@@ -13472,6 +13472,27 @@ img.ibo-navigation-menu--notifications--item--image:not([src=""]) ~ i.ibo-naviga
   background-color: #f5fafd;
   color: #495c68;
 }
+.ibo-select--autocomplete-item {
+  display: flex;
+  justify-content: left;
+  align-items: center;
+}
+.ibo-select--autocomplete-item-image {
+  width: 25px;
+  height: 25px;
+  /* min-xxx are here to avoid medallion to be horizontally compressed when the title is to long */
+  min-width: 25px;
+  min-height: 25px;
+  background-position: center center;
+  background-size: 100%;
+  border-radius: 100%;
+  margin-right: 0.5rem;
+  background-color: #ebf8ff;
+  border: 1px solid #929fb1;
+}
+.ibo-select--autocomplete-item-txt {
+  white-space: nowrap;
+}
 .ibo-input-select-icon > img {
   max-height: 100%;
   max-width: 100%;
@@ -17702,6 +17723,11 @@ body {
   margin-bottom: 15px;
   width: auto;
 }
+.setup-extension--icon {
+  margin-right: 5px;
+  color: #2b6bb0;
+  font-size: 1.33rem;
+}
 /* integrityCheck: end (do not remove/edit) */
 /* Legacy inline stuff */
 #params_summary {
diff --git a/css/setup.scss b/css/setup.scss
index 399e2f862..af8940d12 100644
--- a/css/setup.scss
+++ b/css/setup.scss
@@ -583,6 +583,11 @@ body {
     }
   }
 }
+.setup-extension--icon{
+  margin-right: 5px;
+  color: $ibo-color-blue-700;
+  font-size: $ibo-font-size-200;
+}
 /* integrityCheck: end (do not remove/edit) */
 
 /* Legacy inline stuff */
diff --git a/pages/ajax.render.php b/pages/ajax.render.php
index ffcda957e..eb19c0fb4 100644
--- a/pages/ajax.render.php
+++ b/pages/ajax.render.php
@@ -1452,20 +1452,23 @@ JS
 			$aChoices = $oExtensionsMap->GetChoices();
 			foreach($aChoices as $oExtension)
 			{
+				$sDecorationClass = '';
 				switch ($oExtension->sSource)
 				{
 					case iTopExtension::SOURCE_REMOTE:
-						$sSource = ' <span class="extension-source">'.Dict::S('UI:About:RemoteExtensionSource').'</span>';
+						$sSource = Dict::S('UI:About:RemoteExtensionSource');
+						$sDecorationClass = 'fc fc-chameleon-icon';
 						break;
 
 					case iTopExtension::SOURCE_MANUAL:
-						$sSource = ' <span class="extension-source">'.Dict::S('UI:About:ManualExtensionSource').'</span>';
+						$sSource = Dict::S('UI:About:ManualExtensionSource');
+						$sDecorationClass = 'fas fa-folder';
 						break;
 
 					default:
 						$sSource = '';
 				}
-				$oPage->add('<li title="'.Dict::Format('UI:About:Extension_Version', $oExtension->sInstalledVersion).'">'.$oExtension->sLabel.$sSource.'</li>');
+				$oPage->add('<li title="'.Dict::Format('UI:About:Extension_Version', $oExtension->sInstalledVersion).'">'.$oExtension->sLabel.'<i class="setup-extension--icon '.$sDecorationClass.'" data-tooltip-content="'.$sSource.'"></i></li>');
 			}
 			$oPage->add('</ul>');
 			$oPage->add("</div>");
diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php
index 6b33602ef..aafb9b3b5 100644
--- a/setup/wizardsteps.class.inc.php
+++ b/setup/wizardsteps.class.inc.php
@@ -1963,14 +1963,17 @@ EOF
 
 	protected function GetExtensionSourceLabel($sSource)
 	{
+		$sDecorationClass = '';
 		switch($sSource)
 		{
 			case iTopExtension::SOURCE_MANUAL:
-			$sResult = 'Extension';
+			$sResult = 'Local extensions folder';
+			$sDecorationClass = 'fas fa-folder';
 			break;
 
 			case iTopExtension::SOURCE_REMOTE:
-			$sResult = (ITOP_APPLICATION == 'iTop') ? 'iTop-Hub' : 'ITSM-Designer';
+			$sResult = (ITOP_APPLICATION == 'iTop') ? 'iTop Hub' : 'ITSM Designer';
+			$sDecorationClass = (ITOP_APPLICATION == 'iTop') ? 'fc fc-chameleon-icon' : 'fa pencil-ruler';
 			break;
 
 			default:
@@ -1980,7 +1983,7 @@ EOF
 		{
 			return '';
 		}
-		return '<span style="display:inline-block;font-size:8pt;padding:3px;border-radius:4px;color:#fff;background-color:#1c94c4;margin-left:0.5em;margin-right:0.5em">'.$sResult.'</span>';
+		return '<i class="setup-extension--icon '.$sDecorationClass.'" data-tooltip-content="'.$sResult.'"></i>';
 	}
 
 	protected function DisplayOptions($oPage, $aStepInfo, $aSelectedComponents, $aDefaults, $sParentId = '', $bAllDisabled = false)
@@ -2096,7 +2099,7 @@ EOF
 		$sMoreInfo = (isset($aChoice['more_info']) && ($aChoice['more_info'] != '')) ? '<a target="_blank" href="'.$aChoice['more_info'].'">More information</a>' : '';
 		$sSourceLabel = isset($aChoice['source_label']) ? $aChoice['source_label'] : '';
 		$sId = htmlentities($aChoice['extension_code'], ENT_QUOTES, 'UTF-8');
-		$oPage->add('<label for="'.$sId.'"><b>'.htmlentities($aChoice['title'], ENT_QUOTES, 'UTF-8').'</b>'.$sSourceLabel.'</label> '.$sMoreInfo);
+		$oPage->add('<label for="'.$sId.'">'.$sSourceLabel.'<b>'.htmlentities($aChoice['title'], ENT_QUOTES, 'UTF-8').'</b>'.'</label> '.$sMoreInfo);
 		$sDescription = isset($aChoice['description']) ? htmlentities($aChoice['description'], ENT_QUOTES, 'UTF-8') : '';
 		$oPage->add('<div class="description">'.$sDescription.'<span id="sub_choices'.$sId.'">');
 		if (isset($aChoice['sub_options']))