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/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 358d3e7bff..282e6024fa 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
@@ -103,7 +103,7 @@
                     <div class="modal-header">
                         <h3 class="pull-left modal-title">
                             <span>
-                                <span class="fw-stack">
+                                <span class="fw-stack add-margin-right-2x">
                                     <i class="fw fw-circle-outline fw-stack-2x"></i>
                                     <i class="fw fw-share fw-stack-1x"></i>
                                 </span> Group Sharing
@@ -145,7 +145,7 @@
                     <div class="modal-header">
                         <h3 class="pull-left modal-title">
                             <span>
-                                <span class="fw-stack">
+                                <span class="fw-stack add-margin-right-2x">
                                     <i class="fw fw-circle-outline fw-stack-2x"></i>
                                     <i class="fw fw-bookmark fw-stack-1x"></i>
                                 </span> Group Sharing Role
@@ -262,7 +262,7 @@
                     <div class="modal-header">
                         <h3 class="pull-left modal-title">
                             <span>
-                                <span class="fw-stack">
+                                <span class="fw-stack add-margin-right-2x">
                                     <i class="fw fw-circle-outline fw-stack-2x"></i>
                                     <i class="fw fw-edit fw-stack-1x"></i>
                                 </span> Update Group
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.email.invite-modal/public/js/invite-modal.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.email.invite-modal/public/js/invite-modal.js
index 4a29eae7b2..4845833088 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.email.invite-modal/public/js/invite-modal.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.email.invite-modal/public/js/invite-modal.js
@@ -6,7 +6,7 @@
  * Opens a modal popup with input to enter multiple email addresses to send invites
  */
 function toggleEmailInvite(){
-    modalDialog.header('<h4 class="pull-left modal-title"><span class="fw-stack add-margin-right-1x">' +
+    modalDialog.header('<h4 class="pull-left modal-title"><span class="fw-stack add-margin-right-2x">' +
                        '<i class="fw fw-user fw-stack-2x"></i>' +
                        '<span class="fw-stack fw-move-right fw-move-bottom">' +
                        '<i class="fw fw-circle-outline 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.device.type.qr-modal/qr-modal.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.qr-modal/qr-modal.hbs
index 3a3cab1736..0e03d4b898 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.qr-modal/qr-modal.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.qr-modal/qr-modal.hbs
@@ -19,7 +19,7 @@
     <div id="qr-code-modal" data-enrollment-url="{{@unit.params.enrollmentURL}}" class="hidden">
         <div class="modal-header">
             <h4 class="pull-left modal-title">
-                <span class="fw-stack">
+                <span class="fw-stack add-margin-right-2x">
                     <i class="fw fw-mobile fw-stack-2x"></i>
                     <span class="fw-stack fw-move-right fw-move-bottom">
                       <i class="fw fw-circle-outline 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.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 a7114108ee..17485f5864 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
@@ -2028,6 +2028,11 @@ input[type=number].form-control {
 
 .thumbnail.icon img {
   width: 100%;
+  padding: 10px;
+}
+
+.table .icon-only{
+  cursor: pointer;
 }
 
 /* ========================================================================
@@ -6549,6 +6554,27 @@ select > option:hover {
     color : #C7C7C7;
 }
 
+/**
+ *
+ * Temporary navigation color fix for IoT cloud release
+ *
+ */
+
+header.header-default {
+  background: #181e22 !important;
+  height: 50px;
+}
+
+.navbar-collapse {
+  background: #37474F;
+}
+
+.dropdown-menu > li {
+  width: 100%;
+}
+
+/** End **/
+
 /**
  *
  * Temporary responsive fix for table listing action button width issue
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">