diff --git a/components/cdmf-base-ui/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.listing/public/templates/listing.hbs b/components/cdmf-base-ui/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.listing/public/templates/listing.hbs
index 2b6a6ea261..07965cfd66 100644
--- a/components/cdmf-base-ui/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.listing/public/templates/listing.hbs
+++ b/components/cdmf-base-ui/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.listing/public/templates/listing.hbs
@@ -57,7 +57,7 @@
                        data-devicename="{{name}}">
                     <span class="fw-stack">
 					    <i class="fw fw-ring fw-stack-2x"></i>
-					    <i class="fw fw-group fw-stack-1x"></i>
+					    <i class="fw fw-grouping fw-stack-1x"></i>
 					</span>
                         <span class="hidden-xs hidden-on-grid-view">Group</span>
                     </a>
diff --git a/components/cdmf-base-ui/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.group.listing/listing.hbs b/components/cdmf-base-ui/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.group.listing/listing.hbs
index 8e97ce3306..297c3b1734 100644
--- a/components/cdmf-base-ui/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.group.listing/listing.hbs
+++ b/components/cdmf-base-ui/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.group.listing/listing.hbs
@@ -26,7 +26,7 @@
         <div class="ctrl-info-panel col-centered text-center wr-login">
             <h2>You don't have any group registered at the moment.</h2>
             <br/>
-            {{#if permissions.ADD_GROUPS}}
+            {{#if permissions.ADD_GROUP}}
                 <p class="text-center">
                     <a href="{{@app.context}}/group/add" class="wr-btn">
                     <span class="fw-stack">