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 b5f0f93954..96275a8933 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
@@ -139,7 +139,7 @@
                 {{unit "cdmf.unit.device.operation-mod"}}
                 {{#if deviceCount}}
                     <div id="loading-content" class="col-centered">
-                        <i class="fw fw-settings fw-spin fw-2x"></i>
+                        <i class="fw fw-wso2-logo fw-pulse fw-2x"></i>
                         Loading devices . . .
                         <br>
                     </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.navbar/navbar.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.navbar/navbar.hbs
index db9488ed02..4d8a513c58 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.navbar/navbar.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.navbar/navbar.hbs
@@ -17,7 +17,7 @@
 }}
 
 {{#zone "navbars"}}
-    <nav id="_uuf-navbar" class="navbar navbar-default affix" data-spy="affix" data-offset-top="50"
+    <nav id="_uuf-navbar" class="navbar navbar-default" data-spy="affix" data-offset-top="50"
          data-offset-bottom="40">
         <div class="container-fluid">
             <div class="navbar-header">