diff --git a/css/admin.css b/css/admin.css
index 41d332fd41ec8c266f2be4fa08b06495c432324a..f32f51f710c9da124467be9fbb883abaa61e8e0b 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -44,6 +44,21 @@
   text-align: center;
 }
 
+.crm-container .crm-extensions-version {
+  white-space: nowrap;
+}
+.crm-container .crm-extensions-stage {
+  margin-left: 5px;
+}
+
+.crm-container .crm-extensions-stage.fa-flask {
+  color: #eba12d;
+}
+
+.crm-container .crm-extensions-stage.fa-check-circle {
+  color: #00994D;
+}
+
 @media screen and (min-width: 480px) {
   #crm-container .admin-section-items {
     column-count: 2;
diff --git a/templates/CRM/Admin/Page/Extensions/AddNew.tpl b/templates/CRM/Admin/Page/Extensions/AddNew.tpl
index 04df4239eb70290014817202e78249079a68d000..570e3eafc1ed2a822e6e36771789a0cd65d1a526 100644
--- a/templates/CRM/Admin/Page/Extensions/AddNew.tpl
+++ b/templates/CRM/Admin/Page/Extensions/AddNew.tpl
@@ -24,7 +24,7 @@ Depends: CRM/common/enableDisableApi.tpl and CRM/common/jsortable.tpl
           <td class="crm-extensions-label">
               <a class="collapsed" href="#"></a>&nbsp;<strong>{$row.label}</strong><br/>({$row.key})
           </td>
-          <td class="crm-extensions-label">{$row.version} {if $row.upgradable}<br/>({$row.upgradeVersion}){/if}</td>
+          <td class="crm-extensions-version">{$row.version|escape}</td>
           <td class="crm-extensions-description">{$row.type|capitalize}</td>
           <td>{$row.action|replace:'xx':$row.id}</td>
         </tr>
diff --git a/templates/CRM/Admin/Page/Extensions/Main.tpl b/templates/CRM/Admin/Page/Extensions/Main.tpl
index e7598bab0442470957c1a2362d973a12bf0ac823..3afbdb1d727b29f81d0bfcdef9c4d32dfb4fad5b 100644
--- a/templates/CRM/Admin/Page/Extensions/Main.tpl
+++ b/templates/CRM/Admin/Page/Extensions/Main.tpl
@@ -26,8 +26,14 @@ Depends: CRM/common/enableDisableApi.tpl and CRM/common/jsortable.tpl
                 <div class="crm-extensions-upgrade">{$remoteExtensionRows[$extKey].upgradelink}</div>
               {/if}
           </td>
-          <td class="crm-extensions-label">{$row.statusLabel} {if $row.upgradable}<br/>({ts}Outdated{/ts}){/if}</td>
-          <td class="crm-extensions-label">{$row.version|escape} {if $row.upgradable}<br/>({$row.upgradeVersion}){/if}</td>
+          <td class="crm-extensions-status">{$row.statusLabel} {if $row.upgradable}<br/>({ts}Outdated{/ts}){/if}</td>
+          <td class="crm-extensions-version">{$row.version|escape}
+            {if ($row.develStage and $row.develStage != 'stable') or preg_match(";(alpha|beta|dev);", $row.version)}
+              {icon icon="fa-flask crm-extensions-stage"}{ts}This is a pre-release version. For more details, see the expanded description.{/ts}{/icon}
+            {else}
+              {icon icon="fa-check-circle crm-extensions-stage"}{ts}This is a stable release version.{/ts}{/icon}
+            {/if}
+          </td>
           <td class="crm-extensions-description">{$row.type|escape|capitalize}</td>
           <td>{$row.action|replace:'xx':$row.id}</td>
         </tr>