diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.hbs
index a3c30107a8a..1ed9f22d3e4 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.dashboard/dashboard.hbs
@@ -63,7 +63,7 @@
                 <div class="wr-stats-board-tile">
                     <div class="tile-name">Groups</div>
                     <div>
-                        <div class="tile-icon"><i class="fw fw-grouping"></i></div>
+                        <div class="tile-icon"><i class="fw fw-group"></i></div>
                         <div class="tile-stats">
                             <span id="group-count">{{groupCount}}</span>
                         <span class="tile-stats-free">
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
index fda8e3f5aae..e58df263ddf 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
@@ -186,7 +186,7 @@
                                                    data-toggle="modal" data-target="#modalDemo">
                                                     <span class="icon fw-stack">
                                                         <i class="fw fw-circle-outline fw-stack-2x"></i>
-                                                            <i class="fw fw-grouping fw-stack-1x"></i>
+                                                            <i class="fw fw-group fw-stack-1x"></i>
                                                     </span>
                                                     Add to Group
                                                 </a>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
index 2e8ca928f4f..b3c977f9d11 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
@@ -338,7 +338,7 @@ function loadDevices(searchType, searchParam) {
                                 'data-deviceid="' + deviceIdentifier + '" data-devicetype="' + deviceType
                                 + '" data-devicename="' +
                                 row.name + '"><span class="fw-stack"><i class="fw fw-circle-outline fw-stack-2x"></i>' +
-                                '<i class="fw fw-grouping fw-stack-1x"></i></span>' +
+                                '<i class="fw fw-group fw-stack-1x"></i></span>' +
                                 '<span class="hidden-xs hidden-on-grid-view">Group</span></a>';
                     }
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
index 9e3c0541299..358d3e7bffa 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
@@ -80,7 +80,7 @@
                     <div id="ast-container" class="ast-container list-view">
                         <div class="ctrl-info-panel col-centered text-center wr-login">
                             <h3 class="text-muted">
-                                <i class="fw fw-grouping fw-3x"></i>
+                                <i class="fw fw-group fw-3x"></i>
                             </h3>
                             <h3 class="text-muted">You don't have any group registered at the moment</h3>
                             {{#if permissions.ADD_GROUP}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
index 2a392095e24..95d72644732 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs
@@ -19,10 +19,7 @@
     <ul class="nav navbar-right float-remove-xs text-center-xs">
         <li class="visible-inline-block">
             <a href="#" class="dropdown" data-toggle="dropdown">
-                <span class="icon fw-stack fw-lg">
-                   <i class="fw fw-circle fw-stack-2x"></i>
-                   <i class="fw fw-user fw-stack-1x fw-inverse"></i>
-                </span>
+                <i class="fw fw-user fw-lg fw-helper fw-helper-inverse fw-helper-circle"></i>
                 <span class="hidden-xs add-padding-left-1x">
                     {{#if isSuperTenant }}
                         {{@user.username}}<span class="caret"></span>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
index 3e2c747fef4..21687eef226 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.navbar.nav-menu/nav-menu.hbs
@@ -40,7 +40,7 @@
     {{#if permissions.LIST_GROUPS}}
         <li>
             <a href="{{@app.context}}/groups">
-                <i class="fw fw-grouping"></i>
+                <i class="fw fw-group"></i>
                 Group Management
             </a>
         </li>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
index 345d19f5350..a84549d307e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css
@@ -4556,7 +4556,7 @@ a.wr-side-panel-toggle-btn.selected {
     color: #526A84;
 }
 .wr-advance-operations .wr-hidden-operations-nav a.selected span span > i.fw.fw-circle.fw-stack-2x{
-    color: #fff;
+    color: #526A84;
 }
 .wr-advance-operations .wr-hidden-operations-nav a.selected span span > i.fw.fw-circle.fw-stack-2x.fw-stroke.fw-inverse{
     color: #526A84;
@@ -6507,6 +6507,10 @@ select > option:hover {
     font-weight:400;
 }
 
+.header .fw:before {
+  color: #000;
+}
+
 /* Adding style for required fields */
 .required:before {
   content: "*";