diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css
index bb45a647665..9847ae9dfeb 100644
--- a/ui/css/cloudstack3.css
+++ b/ui/css/cloudstack3.css
@@ -2514,6 +2514,10 @@ div.detail-group.actions td {
   background-position: -73px -23px;
 }
 
+#navigation ul li.affinityGroups span.icon {
+  background-position: -73px -87px;
+}
+
 #navigation ul li.storage span.icon {
   background-position: -127px -23px;
 }
diff --git a/ui/images/icons.png b/ui/images/icons.png
index ea1a39cdf7f..f07ca838ee4 100644
Binary files a/ui/images/icons.png and b/ui/images/icons.png differ
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 4692b61ad88..312d5f4906e 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -246,13 +246,19 @@
           },
 
           hostCount: function(data) {
+          	var data2= {
+              type: 'routing',
+							page: 1,
+							pagesize: 1  //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property.
+            };
+            if(cloudStack.context.zoneType != null && cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type
+              $.extend(data2, {
+                zonetype: cloudStack.context.zoneType
+              });
+            }   
             $.ajax({
               url: createURL('listHosts'),
-              data: {
-                type: 'routing',
-								page: 1,
-								pagesize: 1  //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property.
-              },
+              data: data2,
               success: function(json) {
                 dataFns.primaryStorageCount($.extend(data, {
                   hostCount: json.listhostsresponse.count ?