diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs
index d54c3a1d55..560f597bbe 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs
@@ -27,14 +27,14 @@
     </li>
     <li>
         <a href="{{@app.context}}/users">
-            Users
+            USERS
         </a>
     </li>
 {{/zone}}
 
 {{#zone "navbarActions"}}
     <li>
-        <a href="{{@app.context}}/user/add" class="cu-btn">
+        <a href="{{@app.context}}/user/add">
             <span class="icon fw-stack">
                 <i class="fw fw-add fw-stack-1x"></i>
                 <i class="fw fw-ring fw-stack-2x"></i>
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 2a3054d3af..181056757f 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
@@ -16,38 +16,58 @@
   under the License.
 }}
 {{#zone "navMenu-icon"}}
-    <span class="icon fw-stack"><i class="fw fw-tiles fw-stack-1x"></i></span>
+    <span class="icon fw-stack">
+        <i class="fw fw-tiles fw-stack-1x toggle-icon-up"></i>
+    </span>
 {{/zone}}
 
-{{~#zone "navMenu-items"}}
+{{#zone "navMenu-items"}}
     {{#if permissions.VIEW_DASHBOARD}}
         <li>
-            <a href="{{@app.context}}"><i class="fw fw-dashboard"></i>Admin Dashboard</a>
+            <a href="{{@app.context}}">
+                <i class="fw fw-dashboard"></i>
+                Admin Dashboard
+            </a>
         </li>
     {{/if}}
     {{#if permissions.LIST_OWN_DEVICES}}
         <li>
-            <a href="{{@app.context}}/devices"><i class="fw fw-mobile"></i>Device Management</a>
+            <a href="{{@app.context}}/devices">
+                <i class="fw fw-mobile"></i>
+                Device Management
+            </a>
         </li>
     {{/if}}
     {{#if permissions.LIST_GROUPS}}
         <li>
-            <a href="{{@app.context}}/groups"><i class="fw fw-grouping"></i>Group Management</a>
+            <a href="{{@app.context}}/groups">
+                <i class="fw fw-grouping"></i>
+                Group Management
+            </a>
         </li>
     {{/if}}
     {{#if permissions.ADD_USER}}
         <li>
-            <a href="{{@app.context}}/users"><i class="fw fw-user"></i>User Management</a>
+            <a href="{{@app.context}}/users">
+                <i class="fw fw-user"></i>
+                User Management
+            </a>
         </li>
     {{/if}}
     {{#if permissions.ADD_ROLE}}
         <li>
-            <a href="{{@app.context}}/roles"><i class="fw fw-bookmark"></i>Role Management</a>
+            <a href="{{@app.context}}/roles">
+                <i class="fw fw-bookmark"></i>
+                Role Management
+            </a>
         </li>
     {{/if}}
     {{#if permissions.ADD_POLICY}}
         <li>
-            <a href="{{@app.context}}/policies"><i class="fw fw-policy"></i>Policy Management</a>
+            <a href="{{@app.context}}/policies">
+                <i class="fw fw-policy"></i>
+                Policy Management
+            </a>
         </li>
     {{/if}}
     {{#if permissions.TENANT_CONFIGURATION}}