diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index 8c97ca106b3..93578037168 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -8271,6 +8271,16 @@ div.panel.ui-dialog div.list-view div.fixed-header {
   background-color: #35404B;
 }
 
+.system-dashboard.zone .status_box li .icon {
+  background: url(../images/infrastructure-icons.png) no-repeat 0px 0px;
+  padding: 65px 65px 5px;
+  /*+placement:shift 23px 24px;*/
+  position: relative;
+  left: 23px;
+  top: 24px;
+  position: absolute;
+}
+
 .system-dashboard .status_box li span {
   color: #FFFFFF;
   /*+text-shadow:0px 1px 1px #000000;*/
@@ -8490,6 +8500,39 @@ div.panel.ui-dialog div.list-view div.fixed-header {
   margin: 8px 0 0 9px;
 }
 
+/** Infrastructure icons*/
+.system-dashboard.zone .status_box li.zones .icon {
+  background-position: -36px -105px;
+}
+
+.system-dashboard.zone .status_box li.pods .icon {
+  background-position: -229px -105px;
+}
+
+.system-dashboard.zone .status_box li.clusters .icon {
+  background-position: -411px -96px;
+}
+
+.system-dashboard.zone .status_box li.hosts .icon {
+  background-position: -601px -102px;
+}
+
+.system-dashboard.zone .status_box li.primary-storage .icon {
+  background-position: -36px -404px;
+}
+
+.system-dashboard.zone .status_box li.secondary-storage .icon {
+  background-position: -219px -404px;
+}
+
+.system-dashboard.zone .status_box li.system-vms .icon {
+  background-position: -408px -399px;
+}
+
+.system-dashboard.zone .status_box li.virtual-routers .icon {
+  background-position: -601px -400px;
+}
+
 /*Projects
 ** View switcher*/
 #header .view-switcher {
@@ -10518,15 +10561,6 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it
   font-size: 11px;
 }
 
-/*CS-16413: Disable infrastructure totals*/
-.system-dashboard.zone .status_box li span.header {
-  display: block;
-  width: 156px;
-  font-size: 16px;
-  text-align: center;
-  top: 31px;
-}
-
 /*List state BG colors*/
 .list-view .body td.item-state-on {
   background: #C0FFC0;
diff --git a/ui/images/infrastructure-icons.png b/ui/images/infrastructure-icons.png
new file mode 100644
index 00000000000..7d4f8f9f082
Binary files /dev/null and b/ui/images/infrastructure-icons.png differ
diff --git a/ui/index.jsp b/ui/index.jsp
index 35be67eac37..6c38e363734 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -952,57 +952,65 @@ under the License.
             <span><fmt:message key="label.menu.infrastructure"/></span>
           </div>
           <ul class="status_box good">
-            <li class="block">
+            <li class="block zones">
               <span class="header"><fmt:message key="label.zones"/></span>
+              <span class="icon">&nbsp;</span>
               <span class="overview total" data-item="zoneCount"></span>
               <span class="button view-all zones"
                     view-all-title="<fmt:message key="label.zones"/>"
                     view-all-target="zones"><fmt:message key="label.view.all"/></span>
             </li>
-            <li class="block">
+            <li class="block pods">
               <span class="header"><fmt:message key="label.pods"/></span>
+              <span class="icon">&nbsp;</span>
               <span class="overview total" data-item="podCount"></span>
               <span class="button view-all pods"
                     view-all-title="<fmt:message key="label.pods"/>"
                     view-all-target="pods"><fmt:message key="label.view.all"/></span>
             </li>
-            <li class="block">
+            <li class="block clusters">
               <span class="header"><fmt:message key="label.clusters"/></span>
+              <span class="icon">&nbsp;</span>
               <span class="overview total" data-item="clusterCount"></span>
               <span class="button view-all clusters"
                     view-all-title="<fmt:message key="label.clusters"/>"
                     view-all-target="clusters"><fmt:message key="label.view.all"/></span>
             </li>
-            <li class="block last">
+            <li class="block last hosts">
               <span class="header"><fmt:message key="label.hosts"/></span>
+              <span class="icon">&nbsp;</span>
               <span class="overview total" data-item="hostCount"></span>
               <span class="button view-all hosts"
                     view-all-title="<fmt:message key="label.hosts"/>"
                     view-all-target="hosts"><fmt:message key="label.view.all"/></span>
             </li>
-            <li class="block">
+            <li class="block primary-storage">
               <span class="header"><fmt:message key="label.primary.storage"/></span>
+              <span class="icon">&nbsp;</span>
               <span class="overview total" data-item="primaryStorageCount"></span>
               <span class="button view-all zones"
                     view-all-title="<fmt:message key="label.primary.storage"/>"
                     view-all-target="primaryStorage"><fmt:message key="label.view.all"/></span>
             </li>
-            <li class="block">
+            <li class="block secondary-storage">
               <span class="header"><fmt:message key="label.secondary.storage"/></span>
+              <span class="icon">&nbsp;</span>
               <span class="overview total" data-item="secondaryStorageCount"></span>
               <span class="button view-all pods"
                     view-all-title="<fmt:message key="label.secondary.storage"/>"
                     view-all-target="secondaryStorage"><fmt:message key="label.view.all"/></span>
             </li>
-            <li class="block">
+            <li class="block system-vms">
               <span class="header"><fmt:message key="label.system.vms"/></span>
+              <span class="icon">&nbsp;</span>
               <span class="overview total" data-item="systemVmCount"></span>
               <span class="button view-all clusters"
                     view-all-title="<fmt:message key="label.system.vms"/>"
                     view-all-target="systemVms"><fmt:message key="label.view.all"/></span>
             </li>
-            <li class="block last">
+            <li class="block last virtual-routers">
               <span class="header"><fmt:message key="label.virtual.routers"/></span>
+              <span class="icon">&nbsp;</span>
               <span class="overview total" data-item="virtualRouterCount"></span>
               <span class="button view-all hosts"
                     view-all-title="<fmt:message key="label.virtual.routers"/>"