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 7c1c2a00c2..96d763192b 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
@@ -92,11 +92,11 @@
                     <div class="media-left col-lg-2">
                         <div class="icon">
                             <img src="/devicemgt/public/cdmf.page.groups/images/group-icon.png"
-                                 style="background-color: #11375b; height: 152px;">
+                                 style="background-color: #008cc4; height: 152px;">
                         </div>
                     </div>
                     <div class="media-body asset-desc add-padding-left-5x">
-                        <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
+                        <div style="background: #008cc4; color: #fff; padding: 10px; margin-bottom: 5px">
                             Overview
                         </div>
                         <table class="table table-responsive table-striped" id="members" style="margin-bottom: 0px;">
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.processing/processing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.processing/processing.hbs
index 48a23ed87e..ac4e28107d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.processing/processing.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.processing/processing.hbs
@@ -46,7 +46,7 @@
 {{#zone "topCss"}}
     <style>
     .loading[data-loading-style=overlay] .loading-bg{
-        background: #11375B;
+        background: #008cc4;
         opacity: 1;
         filter: alpha(opacity=100);
     }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.view/view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.view/view.hbs
index aec56d47c9..fb9420eb52 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.view/view.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.view/view.hbs
@@ -87,7 +87,7 @@
                         </div>
                     </div>
                     <div class="media-body asset-desc add-padding-left-5x">
-                        <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Profile Overview
+                        <div style="background: #008cc4; color: #fff; padding: 10px; margin-bottom: 5px">Profile Overview
                         </div>
                         {{#defineZone "user-detail-properties"}}
                             <table class="table table-responsive table-striped" id="members">
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.type-view/public/css/styles.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.type-view/public/css/styles.css
index 98e70ed3fb..c7a6ffec3e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.type-view/public/css/styles.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.type-view/public/css/styles.css
@@ -50,7 +50,7 @@ hr {
 }
 
 .doc-link {
-    background: #11375B;
+    background: #008cc4;
     padding: 20px;
     color: white;
     margin-top: 0;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/css/listing-grid.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/css/listing-grid.css
index 34c3f21139..2f384515cc 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/css/listing-grid.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.types.listing/public/css/listing-grid.css
@@ -28,7 +28,7 @@
     position: absolute;
     top: 20px;
     width: 192px;
-    background: #11375b;
+    background: #008cc4;
 }
 
 .try-device-text {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.effective-policy.view/view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.effective-policy.view/view.hbs
index 025e51d81b..03763aca73 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.effective-policy.view/view.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.effective-policy.view/view.hbs
@@ -13,7 +13,7 @@
     <div class="page-content-wrapper">
         <div class="row no-gutter add-padding-5x add-margin-top-5x" style="border: 1px solid #e4e4e4;">
             <div class="media">
-                <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
+                <div style="background: #008cc4; color: #fff; padding: 10px; margin-bottom: 5px">
                     Policy Overview
                 </div>
                 {{#defineZone "policy-detail-properties"}}
@@ -46,13 +46,13 @@
                         </tbody>
                     </table>
                 {{/defineZone}}
-                <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Description
+                <div style="background: #008cc4; color: #fff; padding: 10px; margin-bottom: 5px">Description
                 </div>
                 <div class="add-margin-top-4x">
                     <div id="policy-description" class="panel-title-description"></div>
                 </div>
                 <br>
-                <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
+                <div style="background: #008cc4; color: #fff; padding: 10px; margin-bottom: 5px">
                     Profile Information
                 </div>
                 <div class="add-margin-top-4x">
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.footer/footer.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.footer/footer.hbs
index 7f3d6cd067..26c2fb0eb3 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.footer/footer.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.footer/footer.hbs
@@ -18,7 +18,7 @@
 {{#zone "footer"}}
     <p>
         <span class="hidden-xs">Entgra IoT Server{{#unless isCloud}} 3.4.0{{/unless}}</span>
-        <span class="visible-xs-inline">Entgra IoT Server{{#unless isCloud}} 3.4.0{{/unless}}</span> | &copy; <script>document.write(new Date().getFullYear());</script>,
+        <span class="visible-xs-inline">Entgra IoT Server{{#unless isCloud}} 3.5.0{{/unless}}</span> | &copy; <script>document.write(new Date().getFullYear());</script>,
         <a href="https://www.entgra.io/" target="_blank">Entgra</a>. All Rights Reserved.
     </p>
 {{/zone}}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.hbs
index 4eb0628de2..5fb0aed14f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/view.hbs
@@ -16,7 +16,7 @@
         <div class="page-content-wrapper">
             <div class="row no-gutter add-padding-5x add-margin-top-5x" style="border: 1px solid #e4e4e4;">
                 <div class="media">
-                    <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
+                    <div style="background: #008cc4; color: #fff; padding: 10px; margin-bottom: 5px">
                         Policy Overview
                     </div>
                     {{#defineZone "policy-detail-properties"}}
@@ -49,13 +49,13 @@
                             </tbody>
                         </table>
                     {{/defineZone}}
-                    <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">Description
+                    <div style="background: #008cc4; color: #fff; padding: 10px; margin-bottom: 5px">Description
                     </div>
                     <div class="add-margin-top-4x">
                         <div id="policy-description" class="panel-title-description"></div>
                     </div>
                     <br>
-                    <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
+                    <div style="background: #008cc4; color: #fff; padding: 10px; margin-bottom: 5px">
                         Profile Information
                     </div>
                     <div class="add-margin-top-4x">
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.logo/logo.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.logo/logo.hbs
index 08776edaaa..9863c2c487 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.logo/logo.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.logo/logo.hbs
@@ -17,9 +17,9 @@
 }}
 
 {{#if isCloud}}
-    {{#zone "productName"}}Cloud{{/zone}}
-    {{#zone "productNameResponsive"}}Cloud{{/zone}}
+    {{#zone "productName"}}{{/zone}}
+    {{#zone "productNameResponsive"}}{{/zone}}
 {{else}}
-    {{#zone "productName"}}IoT Server{{/zone}}
-    {{#zone "productNameResponsive"}} IoTS{{/zone}}
+    {{#zone "productName"}}{{/zone}}
+    {{#zone "productNameResponsive"}}{{/zone}}
 {{/if}}
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-common.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-common.css
index 404f5d170c..4ecd63027c 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-common.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-common.css
@@ -63,9 +63,9 @@
 }
 
 .itm-wiz-current .wiz-no {
-    border: 1px solid #444;
+    border: 1px solid #008cc4;
     color: #fff;
-    background: #444;
+    background: #008cc4;
 }
 
 .itm-wiz {
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 10ceee4af0..27a469d35f 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
@@ -767,7 +767,7 @@ body.inverse .fade-edge:after {
  * header styles
  * ======================================================================== */
 header {
-    background: #11375B;
+    background: #008cc4;
     min-height: 50px;
     position: relative;
 }
@@ -807,7 +807,7 @@ header .dropdown[aria-expanded=true], header .dropdown:hover {
     background: #072038;
 }
 
-header .fw-user:before{
+header .fw-user:before {
     color: #333 !important;
 }
 
@@ -847,7 +847,7 @@ header .fw-user:before{
 }
 
 .navbar {
-    background: #526A84;
+    background: #008cc4;
     border: none;
     margin-bottom: 0;
     min-height: 50px;
@@ -941,7 +941,7 @@ header .fw-user:before{
 }
 
 .navbar-default .navbar-nav > li a {
-    color: #ffffff;
+    color: rgba(0, 0, 0, 0.65);
     text-transform: uppercase;
     padding: 0 15px;
     line-height: 50px;
@@ -967,7 +967,7 @@ header .fw-user:before{
 }
 
 .navbar-collapse.dropdown {
-    background: #5e6165 !important;
+    background: #FFFFFF !important;
     margin-right: -10px;
     margin-left: -10px;
     padding-bottom: 0;
@@ -999,14 +999,14 @@ header .fw-user:before{
     width: 150px;
     height: 120px;
     padding: 15px;
-    background: #2f6292 !important;
+    background: rgb(240, 242, 243) !important;
     display: block;
     overflow: hidden;
     line-height: 1.4em;
 }
 
 .navbar-collapse.tiles ul.nav li li a {
-    background: #526A84;
+    background: #008cc4;
 }
 
 .navbar-collapse.tiles ul.nav li a:hover {
@@ -1032,7 +1032,7 @@ header .fw-user:before{
 .navbar-collapse.tiles ul.nav li.has-sub > a:after {
     width: 7px;
     height: 120px;
-    background: #526a84;
+    background: #008cc4;
     display: inline-block;
     content: " ";
     top: 0;
@@ -1072,8 +1072,8 @@ header .fw-user:before{
 
 .nav-pills > li.active > a, .nav-pills > li.active > a:focus, .nav-pills > li.active > a:hover {
     color: #ffffff;
-    background: #11375B;
-    border-color: #11375B;
+    background: #008cc4;
+    border-color: #008cc4;
 }
 
 /* ========================================================================
@@ -1178,12 +1178,13 @@ header .fw-user:before{
     right: 0;
 }
 
-.all-notifications{
+.all-notifications {
     margin-bottom: 10px !important;
 }
 
-.sidebar-wrapper.toggled a.btn{
+.sidebar-wrapper.toggled a.btn {
     margin-bottom: 70px;
+    background: #008cc4
 }
 
 .sidebar-wrapper-animation-fix {
@@ -1317,12 +1318,13 @@ footer {
     min-height: 40px;
     overflow: hidden;
     color: #cbcbcb;
-    background: #008ba6 !important;
+    background: rgb(240, 242, 243) !important;
     z-index: 1000;
 }
 
 footer > .container,
 footer > .container-fluid {
+    text-align: center;
     padding-right: 15px;
     padding-left: 15px;
 }
@@ -1857,12 +1859,13 @@ a.btn:hover, .btn:hover {
 .btn-default, .btn-default:focus {
     color: #222;
     background-color: #ffffff;
-    border-color: #ffffff;
+    border-color: #ccc !important;
 }
 
 .btn-default:hover {
-    background-color: #e6e6e6;
-    border-color: #ffffff;
+    color: #FFFFFF;
+    background-color: #0280b3;
+    border-color: #0280b3;
 }
 
 .btn-primary, .btn-primary:focus {
@@ -1872,8 +1875,12 @@ a.btn:hover, .btn:hover {
 }
 
 .btn-primary:hover {
-    background-color: #424958;
-    border-color: #2c313b;
+    background-color: #16436D !important;
+    border-color: #16436D !important;
+}
+
+.btn-primary {
+    background-color: #008cc4 !important;
 }
 
 .btn-bordered, .btn-bordered:focus, .btn-bordered:hover {
@@ -2340,8 +2347,8 @@ a.list-group-item:hover {
 
 .list-group-item.active, .list-group-item.active:focus, .list-group-item.active:hover, .active > .list-group-item, .active > .list-group-item:focus, .active > .list-group-item:hover {
     color: #ffffff;
-    background: #11375B;
-    border-color: #11375B;
+    background: #008cc4;
+    border-color: #008cc4;
 }
 
 .list-group-item.active a {
@@ -2689,18 +2696,18 @@ a.list-group-item:hover {
 .checkbox > input[type=checkbox]:disabled + .helper:before {
     cursor: default;
     background: #e6e6e6;
-}
+}RF
 
 .checkbox > input[type=checkbox]:disabled + .helper:after {
     color: #8a8a8a;
 }
 
 .checkbox > input[type=checkbox]:not(:disabled) + .helper:before {
-    border-color: #526A84;
+    border-color: R;
 }
 
 .checkbox > input[type=checkbox] :not(:disabled) + .helper:before {
-    border-color: #526A84;
+    border-color: #008cc4;
 }
 
 .checkbox .helper {
@@ -2766,7 +2773,7 @@ a.ctrl-asset-type-switcher:hover {
     margin-right: 0;
     display: inline-block;
     text-align: center;
-    background: #11375B;
+    background: #008cc4;
     line-height: 49px;
 }
 
@@ -2791,7 +2798,7 @@ a.ast-type-item {
 }
 
 a.ast-type-item:hover {
-    background: #526A84;
+    background: #008cc4;
     cursor: pointer;
 }
 
@@ -2804,7 +2811,7 @@ a.ast-type-item:hover {
 }
 
 .wr-action-btn-bar .page-title {
-    background-color: #526A84;
+    background-color: #008cc4;
     margin: 0;
     font-weight: 400;
 }
@@ -2834,7 +2841,6 @@ a.ast-type-item:hover {
 
 /* device board */
 .wr-device-board {
-    background: #fafafa;
     padding: 10px 0;
     font-size: 20px;
     margin-bottom: 10px;
@@ -2850,7 +2856,7 @@ a.ast-type-item:hover {
 }
 
 /* operations panel/board */
-.operation-tile{
+.operation-tile {
     width: 88px;
     height: 100px;
     background-color: #ebebeb;
@@ -2860,7 +2866,7 @@ a.ast-type-item:hover {
     position: relative;
 }
 
-.operation-tile i{
+.operation-tile i {
     padding: 15px 0px 0px 0px;
     display: block;
     min-height: 65px;
@@ -2868,13 +2874,14 @@ a.ast-type-item:hover {
     font-size: 36px !important;
 }
 
-.operation-tile span{
+.operation-tile span {
     height: 35px;
     line-height: 15px;
     vertical-align: middle;
     display: table-cell !important;
     width: inherit;
 }
+
 .wr-operations-board {
     background: #fafafa;
     margin-bottom: 10px;
@@ -2899,7 +2906,7 @@ a.ast-type-item:hover {
     font-size: 12px;
     text-decoration: none;
     margin-right: 10px;
-    /*color: #526A84;*/
+    /*color: #008cc4;*/
     color: #333;
     min-width: 70px;
     background: #fafafa;
@@ -2951,7 +2958,7 @@ a.ast-type-item:hover {
     font-weight: normal;
     font-size: 13px;
     color: #fff;
-    background: #11375B;
+    background: #008cc4;
     padding: 10px 24px;
     display: inline-block;
     margin-right: 5px;
@@ -3047,7 +3054,7 @@ a.ast-type-item:hover {
 
 .ctrl-wr-asset.selected {
     background: #E4E4E4;
-    border-bottom: 4px solid #526A84;
+    border-bottom: 4px solid #008cc4;
 }
 
 .ctrl-wr-asset:hover {
@@ -3076,7 +3083,7 @@ a.ast-type-item:hover {
 }
 
 .itm-ast:hover h3, .itm-ast:hover .ast-auth {
-    color: #526A84;
+    color: #008cc4;
 }
 
 .ast-img {
@@ -3159,7 +3166,7 @@ h3.ast-name {
 .ast-auth {
     font-weight: 300;
     font-size: 13px;
-    color: #526A84;
+    color: #008cc4;
     display: block;
     margin-bottom: 12px;
     white-space: nowrap;
@@ -3458,7 +3465,7 @@ span.ico-sort-desc {
 }
 
 .wr-asset-type-switcher ul li:hover {
-    background: #526A84;
+    background: #008cc4;
     cursor: pointer;
 }
 
@@ -3495,7 +3502,7 @@ span.ico-sort-desc {
 }
 
 #asset-selected .selected li {
-    background: #526A84;
+    background: #008cc4;
     color: #ffffff;
 }
 
@@ -3564,7 +3571,7 @@ span.ico-sort-desc {
 
 .wr-search-tags span {
     color: #ffffff;
-    background: #11375B;
+    background: #008cc4;
     font-size: 11px;
     display: inline-block;
     cursor: pointer;
@@ -3578,7 +3585,7 @@ span.ico-sort-desc {
 }
 
 .wr-search-tags span:hover {
-    background: #526A84;
+    background: #008cc4;
     color: #ffffff;
 }
 
@@ -3686,7 +3693,7 @@ a.btn-operations {
     font-weight: normal;
     font-size: 13px;
     color: #fff;
-    background: #2f6292;
+    background: #008cc4;
     padding: 5px 20px;
     display: inline-block;
     margin-right: 2px;
@@ -3736,15 +3743,15 @@ a.btn-operations {
 }
 
 .wr-side-panel::-webkit-scrollbar-thumb {
-    background: #526A84;
+    background: #008cc4;
 }
 
 .wr-side-panel::-webkit-scrollbar-thumb:hover {
-    background: #526A84;
+    background: #008cc4;
 }
 
 .wr-side-panel::-webkit-scrollbar-thumb:active {
-    background: #526A84;
+    background: #008cc4;
 }
 
 .wr-notification-bar.toggled, .wr-side-panel.toggled {
@@ -3778,14 +3785,14 @@ a.wr-notification-toggle-btn.selected {
 }
 
 a.wr-side-panel-toggle-btn.selected {
-    background-color: #11375B;
+    background-color: #008cc4;
     color: #fff;
 }
 
 .wr-side-panel .panel-title a {
     display: block;
     padding: 10px;
-    background: #11375B;
+    background: #008cc4;
     color: #fff;
     border-bottom: 1px solid #e4e4e4;
 }
@@ -3823,7 +3830,7 @@ a.wr-side-panel-toggle-btn.selected {
 }
 
 .wr-panel-notes .wr-input-control.checkbox .helper:before {
-    border-color: #526A84;
+    border-color: #008cc4;
 }
 
 .wr-panel-notes .add-btn {
@@ -3875,7 +3882,7 @@ a.wr-side-panel-toggle-btn.selected {
 
 .wr-panel-msg {
     background: #fff;
-    border-right: 2px solid #526A84;
+    border-right: 2px solid #008cc4;
     padding: 8px 35px 8px 10px;
     margin-left: 35px;
     margin-bottom: 5px;
@@ -3884,7 +3891,7 @@ a.wr-side-panel-toggle-btn.selected {
 }
 
 .wr-panel-msg .dropdown-menu {
-    background: #526A84;
+    background: #008cc4;
     color: #fff;
     left: -167px;
     top: -2px;
@@ -3916,7 +3923,7 @@ a.wr-side-panel-toggle-btn.selected {
 
 .wr-panel-msg .msg-options .btn.dropdown-toggle:hover, .wr-panel-msg .msg-options .btn.dropdown-toggle[aria-expanded="true"] {
     color: #fff;
-    background-color: #526A84;
+    background-color: #008cc4;
 }
 
 .wr-panel-msg-visibility {
@@ -4044,11 +4051,12 @@ a.wr-side-panel-toggle-btn.selected {
 
 /* stats */
 .wr-stats-board-tile {
-    background: #0c3b42;
-    color: #fff;
+    background: #FFFFFF;
+    color: rgba(0, 0, 0, 0.65);
     padding: 15px;
     height: 110px;
     margin-bottom: 10px;
+    box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
 }
 
 .device-detail-body .wr-stats-board-tile {
@@ -4096,7 +4104,7 @@ a.wr-side-panel-toggle-btn.selected {
 }
 
 .tile-bg {
-    background: #11375B;
+    background: #008cc4;
     color: #fff;
 }
 
@@ -4130,7 +4138,7 @@ a.wr-side-panel-toggle-btn.selected {
 }
 
 .tile-stats-free a {
-    color: #b2b2b2;
+    color: rgba(0,0,0, 0.65);
     font-weight: 500;
     text-decoration: none;
     display: inline-block;
@@ -4139,7 +4147,8 @@ a.wr-side-panel-toggle-btn.selected {
 }
 
 .tile-stats-free a:hover {
-    color: #fff;
+    color: #008cc4;
+    text-decoration: none !important;
 }
 
 .tile-stats-type {
@@ -4197,7 +4206,7 @@ a.wr-side-panel-toggle-btn.selected {
 .wr-form .wr-operation-icon {
     font-size: 32px;
     margin-right: 10px;
-    color: #11375B;
+    color: #008cc4;
 }
 
 .wr-form .user-select {
@@ -4248,7 +4257,7 @@ a.wr-side-panel-toggle-btn.selected {
     /*outline: 2px #a6a6a6 solid;*/
     border: 1px #fff solid;
     cursor: pointer;
-    /*background: #526A84;*/
+    /*background: #008cc4;*/
     background: #a6a6a6;
     /*margin-left: 2px;*/
     z-index: 1;
@@ -4264,9 +4273,9 @@ a.wr-side-panel-toggle-btn.selected {
     width: 24px;
     height: 24px;
     /*outline: 2px #333 solid;*/
-    border: 1px #526A84 solid;
+    border: 1px #008cc4 solid;
     cursor: pointer;
-    background: #526A84;
+    background: #008cc4;
     z-index: 2;
     border-radius: 12px;
     /*box-shadow: 0 1px 2px #888888;*/
@@ -4405,7 +4414,7 @@ a.wr-side-panel-toggle-btn.selected {
 }
 
 .wr-input-control.checkbox input[type="checkbox"]:checked + .helper:before {
-    border: 2px #526A84 solid;
+    border: 2px #008cc4 solid;
 }
 
 .wr-input-control.checkbox input[type="checkbox"]:checked + .helper:after {
@@ -4422,7 +4431,7 @@ a.wr-side-panel-toggle-btn.selected {
     left: 2px;
     margin-left: 0;
     text-align: center;
-    background: #526A84;
+    background: #008cc4;
     color: #fff;
     font-family: font-wso2;
 }
@@ -4441,11 +4450,11 @@ a.wr-side-panel-toggle-btn.selected {
 }
 
 .wr-input-control.checkbox:hover input:not(:disabled) + .helper:before {
-    border-color: #526A84;
+    border-color: #008cc4;
 }
 
 .wr-input-control.checkbox:active input:not(:disabled) + .helper:before {
-    border-color: #526A84;
+    border-color: #008cc4;
 }
 
 /* list group styles */
@@ -4501,7 +4510,7 @@ a.wr-side-panel-toggle-btn.selected {
 .wr-list-email, .wr-list-email:hover {
     font-weight: 300;
     font-size: 13px;
-    color: #526A84;
+    color: #008cc4;
 }
 
 .wr-sortable .list-group-item, tbody.wr-sortable td {
@@ -4520,7 +4529,7 @@ a.wr-side-panel-toggle-btn.selected {
     width: 50px;
     height: 50px;
     line-height: 42px;
-    background: #526A84;
+    background: #008cc4;
     color: #fff;
     font-size: 28px;
     text-align: center;
@@ -4598,16 +4607,16 @@ a.wr-side-panel-toggle-btn.selected {
 /*}*/
 
 .wr-list-group .wr-desc-list-configs.highlight {
-    background: #14212E;
+    background: #008cc4;
     color: #fff;
 }
 
 .wr-list-group .wr-desc-list-configs.highlight2 {
-    background: #CDCDCD;
+    background: #008cc4;
 }
 
 .wr-list-group .wr-desc-list-configs b {
-    color: #526A84;
+    color: rgba(0,0,0, 0.65);
 }
 
 .panel-title a .fw-stack {
@@ -4620,7 +4629,7 @@ a.wr-side-panel-toggle-btn.selected {
 
 .footer a {
     text-decoration: none;
-    color: #fff;
+    color: rgba(0,0,0, 0.65);
 }
 
 .footer .fw {
@@ -4663,7 +4672,7 @@ a.wr-side-panel-toggle-btn.selected {
 }
 
 .wr-hidden-nav ul li a:hover {
-    background: #526A84;
+    background: #008cc4;
 }
 
 .wr-hidden-nav ul li a i {
@@ -4703,7 +4712,7 @@ a.wr-side-panel-toggle-btn.selected {
     margin: 5px;
     border: 1px solid #e8e8e8;
     background: #ffffff;
-    color: #526A84;
+    color: #008cc4;
     padding: 10px;
     text-decoration: none;
     font-size: 16px;
@@ -4745,20 +4754,20 @@ a.wr-side-panel-toggle-btn.selected {
 }
 
 .wr-advance-operations .wr-hidden-operations-nav a.selected span span > i {
-    color: #526A84;
+    color: #008cc4;
 }
 
 .wr-advance-operations .wr-hidden-operations-nav a.selected span span > i.fw.fw-circle.fw-stack-2x {
-    color: #526A84;
+    color: #008cc4;
 }
 
 .wr-advance-operations .wr-hidden-operations-nav a.selected span span > i.fw.fw-circle.fw-stack-2x.fw-stroke.fw-inverse {
-    color: #526A84;
+    color: #008cc4;
 }
 
 .wr-advance-operations .wr-hidden-operations-nav a.selected, .wr-hidden-operations .wr-hidden-operations-nav a.selected:hover {
     color: #ffffff;
-    background: #526A84;
+    background: #008cc4;
 }
 
 .wr-hidden-operations {
@@ -4910,7 +4919,7 @@ a.show-operations-btn {
 }
 
 a.show-operations-btn.selected {
-    background: #526A84;
+    background: #008cc4;
     color: #fff;
 }
 
@@ -5029,7 +5038,7 @@ a.show-operations-btn .btn-text:before {
     width: 100%;
     height: 120px;
     padding: 20px;
-    background: #132D45;
+    background: #008cc4 !important;
     display: block;
     overflow: hidden;
     text-align: center;
@@ -5046,7 +5055,7 @@ a.show-operations-btn .btn-text:before {
 }
 
 .tile-buttons li a:hover {
-    background: #526A84;
+    background: #0280b3 !important;
 }
 
 .tile-buttons li a i {
@@ -5130,12 +5139,12 @@ a.show-operations-btn .btn-text:before {
 }
 
 a.cu-btn-inner.inverse {
-    background: #11375B;
+    background: #008cc4;
     color: #fff;
 }
 
 a.cu-btn-inner.inverse:hover {
-    background: #526A84;
+    background: #008cc4;
 }
 
 .wiz-lbl {
@@ -5176,7 +5185,7 @@ a.cu-btn-inner.inverse:hover {
 }
 
 .wizard-head > li a:hover {
-    color: #526A84;
+    color: #008cc4;
 }
 
 .wizard-head > li.active, .wizard-head > li.active a {
@@ -5190,7 +5199,7 @@ a.cu-btn-inner.inverse:hover {
 
 .wizard-head .wizard-home-icon {
     font-size: 30px;
-    color: #11375b;
+    color: #008cc4;
     margin-top: -6px;
     margin-right: 20px;
 }
@@ -5245,7 +5254,7 @@ a.cu-btn-inner.inverse:hover {
     margin-bottom: 1px;
     text-decoration: none;
     display: block;
-    color: #11375b;
+    color: #008cc4;
 }
 
 .multi-view .nav > ul li li a {
@@ -5253,7 +5262,7 @@ a.cu-btn-inner.inverse:hover {
 }
 
 .multi-view .nav > ul li a:hover, .multi-view .nav > ul li a.active {
-    background: #11375b;
+    background: #008cc4;
     color: #fff;
 }
 
@@ -5283,7 +5292,7 @@ a.cu-btn-inner.inverse:hover {
 }
 
 .multi-view .content {
-    border-left: 2px solid #11375b;
+    border-left: 2px solid #008cc4;
 }
 
 .multi-view .content ul, .multi-view .content ul li {
@@ -5352,7 +5361,7 @@ a.grid-input-add {
     margin-top: 10px;
     margin-bottom: 10px;
     font-size: 14px;
-    border: 1px solid #526A84;
+    border: 1px solid #008cc4;
 }
 
 a.grid-input-add:hover, a.grid-input-add:active, a.grid-input-add:focus {
@@ -6264,7 +6273,7 @@ body.inverse .fade-edge:after {
 .thumbnail.icon {
     border: none;
     margin: 0;
-    background: #638bb1 !important;
+    background: #008cc4 !important;
     color: #fff;
     text-align: center;
     position: relative;
@@ -6339,8 +6348,8 @@ body.inverse .fade-edge:after {
 .pagination > .active > span,
 .pagination > .active > span:focus,
 .pagination > .active > span:hover {
-    background: #11375B;
-    border-color: #11375B;
+    background: #008cc4;
+    border-color: #008cc4;
 }
 
 .pagination > .disabled > a,
@@ -6413,7 +6422,7 @@ ul.tiles .icon {
  * ======================================================================== */
 .asset-image {
     max-width: 150px;
-    background: #11375B;
+    background: #008cc4;
     float: none !important;
 }
 
@@ -6456,8 +6465,8 @@ ul.tiles .icon {
 .list-group-item.active,
 .list-group-item.active:focus,
 .list-group-item.active:hover {
-    background: #11375B;
-    border-color: #11375B;
+    background: #008cc4;
+    border-color: #008cc4;
     color: #fff;
 }
 
@@ -6544,7 +6553,7 @@ ul.tiles .icon {
     font-size: 12px;
     text-decoration: none;
     margin-right: 10px;
-    color: #526A84;
+    color: #008cc4;
     width: 100px;
     background: #fafafa;
     padding: 2px 10px 10px 10px;
@@ -6689,7 +6698,7 @@ ul.tiles .icon {
 }
 
 .navbar-default .navbar-nav > li a > .fw-stack > .fw-stack > .fw-circle:not(.fw-stroke) {
-    color: #526A84;
+    color: #008cc4;
 }
 
 .navbar-default .navbar-nav > li:hover a > .fw-stack > .fw-stack > .fw-circle:not(.fw-stroke) {
@@ -6740,7 +6749,7 @@ ul.tiles .icon {
 }
 
 .media .panel.active .panel-heading.visible-xs {
-    background: #11375b;
+    background: #008cc4;
     color: #fff;
 }
 
@@ -6917,7 +6926,7 @@ select > option:hover {
 .device-type-img.fw {
     font-size: 250px;
     color: white;
-    background: #11375b;
+    background: #008cc4;
     padding: 35px;
 }
 
@@ -6938,7 +6947,8 @@ select > option:hover {
 }
 
 .btn-operations:hover, .btn-operations:focus, .btn-operations:active {
-    color: #C7C7C7;
+    color: #ffffff !important;
+    background-color: #16436D !important;
 }
 
 /**
@@ -6948,12 +6958,12 @@ select > option:hover {
  */
 
 header.header-default {
-    background: #008ba6 !important;
+    background: #FFFFFF !important;
     height: 50px;
 }
 
 .navbar-collapse {
-    background: #37474F;
+    background: #FFFFFF;
 }
 
 .dropdown-menu > li {
@@ -7009,7 +7019,7 @@ header.header-default {
     line-height: 0px !important;
 }
 
-.header .fw-user{
+.header .fw-user {
     color: #333 !important;
 }
 
@@ -7022,5 +7032,5 @@ header .brand img.logo {
 }
 
 try-device-image {
-    background: #638bb1 !important;
+    background: #008cc4 !important;
 }
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-theme.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-theme.css
index 559a522e06..2efafee3aa 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-theme.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-theme.css
@@ -188,7 +188,7 @@ h1, .h1 {
 }
 
 .dropdown-menu-content a {
-	color: #11375B;
+	color: #008cc4;
     padding: 8px 10px;
 	cursor:pointer;
 	display:block;
@@ -196,7 +196,7 @@ h1, .h1 {
 
 .dropdown-menu-content a:hover {
     color:#fff;
-    background: #11375B;
+    background: #008cc4;
 }
 
 
@@ -417,8 +417,8 @@ a.ctrl-filter-category:hover {
 
 .btn-primary {
 	color: #fff;
-	background-color: #11375b;
-	border-color: #11375b;
+	background-color: #008cc4;
+	border-color: #008cc4;
 }
 
 .btn-primary:hover, .btn-primary:focus, .btn-primary.focus, .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/less/theme-variables.less b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/less/theme-variables.less
index 8095451680..88150ac8b8 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/less/theme-variables.less
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/less/theme-variables.less
@@ -3,14 +3,14 @@
  * ======================================================================== */
 @font-default: 'Open Sans', Arial, Helvetica, sans-serif;
 
-@base-dark-color: #11375B;
+@base-dark-color: #008cc4;
 @base-light-color: #ffffff;
 @base-success-color: #5cb85c;
 @base-info-color: #526A84;
 @base-warning-color: #f0ad4e;
 @base-danger-color: #d9534f;
 
-@primary-color: #11375b;
+@primary-color: #008cc4;
 @secondary-color: #e4e4e4;
 @optional-color: #F47415;
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/public/img/favicon.png b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/public/img/favicon.png
index 04259f54e8..43c53c4066 100644
Binary files a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/public/img/favicon.png and b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.favicon/public/img/favicon.png differ
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.footer/footer.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.footer/footer.hbs
index 627c2ddcf0..69cb55d789 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.footer/footer.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.footer/footer.hbs
@@ -17,8 +17,8 @@
 }}
 {{#zone "footer"}}
     <p>
-        <span class="hidden-xs">Entgra IoT Server 3.3.1</span>
-        <span class="visible-xs-inline">Entgra IoT Server 3.3.1</span> | © <script>document.write(new Date().getFullYear());</script>,
+        <span class="hidden-xs">Entgra IoT Server 3.5.0</span>
+        <span class="visible-xs-inline">Entgra IoT Server 3.5.0</span> | © <script>document.write(new Date().getFullYear());</script>,
         <a href="http://wso2.com/" target="_blank"><i class="icon fw fw-wso2"></i> Inc</a>. All Rights Reserved.
     </p>
 {{/zone}}
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/public/img/logo-inverse.png b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/public/img/logo-inverse.png
new file mode 100644
index 0000000000..b4cba1d37c
Binary files /dev/null and b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/public/img/logo-inverse.png differ
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/public/img/logo-inverse.svg b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/public/img/logo-inverse.svg
deleted file mode 100644
index 72323a3fd0..0000000000
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/public/img/logo-inverse.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<svg version="1.1" id="wso2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="29 -6.639 72 27.639" enable-background="new 29 -6.639 72 27.639" xml:space="preserve">
-<g>
-	<circle fill="#F47B20" cx="82.076" cy="4.192" r="8.691"/>
-	<path d="M90.804,3.776l-0.01-0.115h-0.115c-0.53-0.001-1.061,0-1.594,0c-0.531,0-1.062,0-1.593,0h-0.073l-0.035,0.063
-		c-0.402,0.711-0.798,1.425-1.193,2.14L85.843,6.49c-0.601-1.454-1.198-2.908-1.795-4.363c-0.63-1.535-1.26-3.07-1.895-4.603
-		l-0.11-0.266l-0.119,0.262c-0.456,1.005-0.908,2.013-1.359,3.021c-0.62,1.383-1.261,2.812-1.905,4.212
-		c-0.897-0.008-1.794-0.007-2.695-0.006c-0.823,0.001-1.648,0.002-2.475-0.004l-0.128-0.001l0.002,0.128
-		c0.004,0.278,0.044,0.554,0.083,0.821l0.021,0.148h0.108c1.432-0.002,2.863-0.002,4.293-0.001h1.512l0.034-0.073
-		c0.44-0.972,0.878-1.947,1.316-2.921c0.421-0.938,0.842-1.875,1.267-2.811c0.643,1.552,1.279,3.106,1.917,4.661
-		c0.558,1.359,1.115,2.719,1.677,4.077l0.098,0.237l0.127-0.224c0.576-1.025,1.147-2.054,1.719-3.082l0.528-0.951
-		c0.876,0,1.751,0,2.625,0h0.115l0.01-0.115C90.834,4.383,90.832,4.11,90.804,3.776z"/>
-	<path fill="#F47B20" d="M29-6.61c0.849,0.001,1.696-0.002,2.545,0.002c2.065,5.082,4.121,10.169,6.198,15.247
-		c2.069-5.093,4.122-10.194,6.213-15.278c2.067,5.095,4.138,10.188,6.205,15.283c2.068-5.084,4.126-10.172,6.198-15.255
-		c0.857,0.001,1.716-0.002,2.573,0.001c-2.883,7.122-5.778,14.24-8.658,21.364c-0.008,0.103-0.157,0.273-0.192,0.074
-		c-2.042-5.053-4.094-10.1-6.127-15.157c-2.084,5.111-4.142,10.233-6.216,15.347C34.82,7.813,31.908,0.602,29-6.61z"/>
-	<path fill="#F47B20" d="M60.721-5.513c1.362-0.97,3.118-1.239,4.751-1.046c1.875,0.271,3.473,1.576,4.363,3.213
-		c-0.618,0.407-1.25,0.793-1.865,1.205c-0.329-0.36-0.55-0.802-0.893-1.15c-0.453-0.498-1.041-0.895-1.709-1.027
-		c-1.316-0.275-2.805,0.074-3.734,1.083c-0.996,1.055-1.006,3.01,0.193,3.919c0.841,0.609,1.756,1.108,2.677,1.586
-		c1.174,0.532,2.363,1.052,3.429,1.787c0.741,0.523,1.531,1.047,2,1.847c0.684,1.164,0.755,2.589,0.537,3.894
-		c-0.291,1.735-1.421,3.248-2.881,4.192c-1.289,0.842-2.883,1.128-4.401,0.968c-1.382-0.108-2.744-0.654-3.748-1.624
-		c-1.047-0.983-1.665-2.335-1.985-3.718c0.763-0.234,1.526-0.463,2.288-0.698c0.283,1.176,0.807,2.364,1.789,3.12
-		c0.933,0.742,2.211,0.893,3.355,0.68c1.338-0.239,2.507-1.217,3.011-2.474c0.314-0.84,0.416-1.786,0.158-2.653
-		c-0.175-0.6-0.595-1.103-1.111-1.443c-1.075-0.714-2.207-1.342-3.385-1.869c-0.904-0.408-1.784-0.874-2.603-1.436
-		c-0.654-0.453-1.336-0.917-1.767-1.604c-0.69-1.087-0.784-2.461-0.533-3.698C58.902-3.703,59.689-4.796,60.721-5.513z"/>
-	<path fill="#FFFFFF" d="M81.274-6.595c1.743-0.113,3.52,0.152,5.121,0.864c3.276,1.389,5.746,4.501,6.343,8.011
-		c0.419,2.347,0.048,4.832-1.074,6.939c-1.465,2.814-4.231,4.91-7.342,5.546c-2.047,0.43-4.217,0.261-6.168-0.498
-		c-1.884-0.728-3.556-1.996-4.76-3.617c-1.276-1.699-2.032-3.785-2.128-5.908c-0.145-2.528,0.646-5.1,2.194-7.105
-		C75.301-4.806,78.221-6.391,81.274-6.595z M79.977-4.147c-2.324,0.573-4.367,2.172-5.489,4.285
-		c-0.785,1.439-1.099,3.101-1.022,4.731h0.024c0.004,0.283,0.047,0.565,0.088,0.846c0.455,2.707,2.287,5.133,4.77,6.303
-		c1.988,0.968,4.358,1.12,6.453,0.409c1.752-0.574,3.295-1.744,4.35-3.254c0.934-1.328,1.469-2.926,1.538-4.546
-		c0.024-0.281,0.014-0.561-0.009-0.841c-0.083-1.637-0.639-3.25-1.596-4.581c-1.104-1.553-2.738-2.719-4.566-3.258
-		C83.049-4.491,81.462-4.526,79.977-4.147z"/>
-	<path fill="#FFFFFF" d="M93.688,3.448c1.131-0.311,2.351-0.314,3.479,0.015c1.542,0.453,2.786,1.721,3.318,3.223
-		c0.526,1.563,0.294,3.35-0.576,4.747c-0.709,1.137-1.603,2.146-2.506,3.132c-1.461,1.578-2.927,3.152-4.387,4.732
-		c2.661-0.004,5.322-0.001,7.983-0.002c-0.001,0.568,0.001,1.136-0.001,1.705c-3.943-0.004-7.886,0.003-11.829-0.003
-		c2.519-2.731,5.062-5.44,7.571-8.18c0.917-1.088,1.998-2.181,2.249-3.64c0.232-1.143-0.129-2.387-0.985-3.189
-		c-1.102-1.147-2.93-1.389-4.359-0.759C93.685,4.637,93.755,4.04,93.688,3.448z"/>
-</g>
-</svg>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/public/img/logo.png b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/public/img/logo.png
index d763305ca3..b4cba1d37c 100644
Binary files a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/public/img/logo.png and b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header.logo/public/img/logo.png differ
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css
index e1a6f2a7ad..0b3167f64c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css
@@ -495,7 +495,7 @@ body {
   font-size: 14px;
   line-height: 1.42857;
   color: #333333;
-  background-color: #fff;
+  background-color: rgb(240,242,243);
 }
 
 input,
@@ -777,7 +777,7 @@ a.text-success:focus {
 }
 
 .text-info {
-  color: #526A84;
+  color: #008cc4;
 }
 
 a.text-info:hover,
@@ -826,7 +826,7 @@ a.bg-success:focus {
 }
 
 .bg-info {
-  background-color: #526A84;
+  background-color: #008cc4;
 }
 
 a.bg-info:hover,
@@ -2088,7 +2088,7 @@ table th[class*="col-"] {
 .table > tfoot > tr > th.info,
 .table > tfoot > tr.info > td,
 .table > tfoot > tr.info > th {
-  background-color: #526A84;
+  background-color: #008cc4;
 }
 
 .table-hover > tbody > tr > td.info:hover,
@@ -2776,14 +2776,14 @@ header {
   position: relative;
 }
 header.header-default {
-  background: #11375b;
+  background: #008cc4;
   color: #fff;
 }
 header a,
 header a:hover,
 header a:visited,
 header a:focus {
-  color: #fff;
+  color: rgba(0,0,0, 0.65) !important;
   text-decoration: none;
 }
 header .brand {
@@ -2810,16 +2810,16 @@ header .nav > li > a {
   height: 50px;
 }
 header .nav > li > a:hover {
-  background: #262626;
+  background: #FFFFFF;
 }
 header .nav > li > a:focus {
   color: #fff;
-  background: #262626;
+  background: #008cc4;
 }
 header .nav .open > a,
 header .nav .open > a:hover,
 header .nav .open > a:focus {
-  background: black;
+  background: #FFFFFF;
 }
 header .nav .dropdown-menu {
   background: black;
@@ -2828,7 +2828,8 @@ header .nav .dropdown-menu {
   top:50px;
 }
 header .nav .dropdown-menu a {
-  color: #fff;
+  color: rgba(0,0,0, 0.65) !important;
+  background-color: white;
 }
 header .fw-inverse, header .fa-inverse {
   color: #191919;
@@ -2838,7 +2839,7 @@ footer {
   width: 100%;
   min-height: 40px;
   overflow: hidden;
-  color: #cbcbcb;
+  color: rgba(0,0,0, 0.65);
   background: #222222;
 }
 footer > .container, footer > .container-fluid {
@@ -3912,7 +3913,7 @@ tbody.collapse.in {
     background-color:#fff!important;
   }
   .navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus{
-    background-color:#526a84!important;
+    background-color:#008cc4!important;
   }
   .navbar-default .navbar-toggle:hover .icon-bar, .navbar-default .navbar-toggle:focus .icon-bar{
     background-color:#798EA5!important;
@@ -3929,7 +3930,7 @@ tbody.collapse.in {
   }
 }
 .navbar-default {
-  background-color: #f8f8f8;
+  background-color: #FFFFFF;
   border-color: #e7e7e7;
 }
 .navbar-default .navbar-brand {
@@ -4320,7 +4321,7 @@ a.label:hover, a.label:focus {
 }
 
 .label-info {
-  background-color: #526A84;
+  background-color: #008cc4;
 }
 .label-info[href]:hover, .label-info[href]:focus {
   background-color: #006d74;
@@ -4461,7 +4462,7 @@ a.thumbnail.active {
 .thumbnail.icon {
   border: none;
   margin: 0;
-  background: #11375b;
+  background: #008cc4;
   color: #fff;
   text-align: center;
   overflow: hidden;
@@ -4556,8 +4557,8 @@ a.thumbnail.active {
 }
 
 .alert-info {
-  background-color: #526A84;
-  border-color: #526A84;
+  background-color: #008cc4;
+  border-color: #008cc4;
   color: #fff;
 }
 .alert-info hr {
@@ -4692,7 +4693,7 @@ a.thumbnail.active {
 }
 
 .progress-bar-info {
-  background-color: #526A84;
+  background-color: #008cc4;
 }
 .progress-striped .progress-bar-info {
   background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@@ -4880,13 +4881,13 @@ button.list-group-item-success.active:focus {
 }
 
 .list-group-item-info {
-  color: #526A84;
-  background-color: #526A84;
+  color: #008cc4;
+  background-color: #008cc4;
 }
 
 a.list-group-item-info,
 button.list-group-item-info {
-  color: #526A84;
+  color: #008cc4;
 }
 a.list-group-item-info .list-group-item-heading,
 button.list-group-item-info .list-group-item-heading {
@@ -4895,7 +4896,7 @@ button.list-group-item-info .list-group-item-heading {
 a.list-group-item-info:hover, a.list-group-item-info:focus,
 button.list-group-item-info:hover,
 button.list-group-item-info:focus {
-  color: #526A84;
+  color: #008cc4;
   background-color: #00858e;
 }
 a.list-group-item-info.active, a.list-group-item-info.active:hover, a.list-group-item-info.active:focus,
@@ -4903,8 +4904,8 @@ button.list-group-item-info.active,
 button.list-group-item-info.active:hover,
 button.list-group-item-info.active:focus {
   color: #fff;
-  background-color: #526A84;
-  border-color: #526A84;
+  background-color: #008cc4;
+  border-color: #008cc4;
 }
 
 .list-group-item-warning {
@@ -5284,22 +5285,22 @@ button.list-group-item-danger.active:focus {
 }
 
 .panel-info {
-  border-color: #526A84;
+  border-color: #008cc4;
 }
 .panel-info > .panel-heading {
-  color: #526A84;
-  background-color: #526A84;
-  border-color: #526A84;
+  color: #008cc4;
+  background-color: #008cc4;
+  border-color: #008cc4;
 }
 .panel-info > .panel-heading + .panel-collapse > .panel-body {
-  border-top-color: #526A84;
+  border-top-color: #008cc4;
 }
 .panel-info > .panel-heading .badge {
-  color: #526A84;
-  background-color: #526A84;
+  color: #008cc4;
+  background-color: #008cc4;
 }
 .panel-info > .panel-footer + .panel-collapse > .panel-body {
-  border-bottom-color: #526A84;
+  border-bottom-color: #008cc4;
 }
 
 .panel-warning {
@@ -5454,10 +5455,10 @@ button.close {
   color: #5cb85c;
 }
 .message-info {
-  border-left-color: #526A84;
+  border-left-color: #008cc4;
 }
 .message-info h4 {
-  color: #526A84;
+  color: #008cc4;
 }
 .message-warning {
   border-left-color: #f0ad4e;
@@ -6364,7 +6365,7 @@ button.close {
     display: block !important;
   }
 
-  table.visible-print {
+  table.visible-print {.nav > li > a:hover, .nav > li > a:focus
     display: table !important;
   }
 
@@ -6909,7 +6910,7 @@ button.close {
 }
 
 .icon-info {
-  color: #526A84;
+  color: #008cc4;
 }
 
 .icon-warning {
@@ -7044,6 +7045,7 @@ body.inverse .fade-edge:after {
  * navbar styles
  * ======================================================================== */
 .navbar-wrapper {
+  box-shadow: 0 1px 4px 3px rgba(0,21,41,.08);
   min-height: 40px;
 }
 
@@ -7063,7 +7065,7 @@ body.inverse .fade-edge:after {
 }
 
 .navbar {
-  background: #526A84;
+  background: #008cc4;
   border: none;
   margin-bottom: 0;
   -webkit-border-radius: 0;
@@ -7108,15 +7110,15 @@ body.inverse .fade-edge:after {
   padding: 0 8px;
   line-height: 40px;
   font-size: 18px;
-  background: #F47415;
-  color: #ffffff;
+  background: #FFFFFF;
+  color: rgba(0,0,0, 0.65);
 }
 .navbar-menu-toggle:hover, .navbar-menu-toggle:focus, .navbar-menu-toggle:active {
   color: #ffffff;
-  background: #D56613;
+  background: #008cc4;
 }
 .navbar-menu-toggle[aria-expanded=true] {
-  background: #D56613;
+  background: #008cc4;
 }
 .navbar-menu-toggle .icon {
   line-height: 40px;
@@ -7137,12 +7139,12 @@ body.inverse .fade-edge:after {
   padding: 0 15px;
   line-height: 40px;
   text-transform: uppercase;
-  background: #010F1F;
+  background: #FFFFFF;
 }
 
 .navbar > .container .navbar-brand a,
 .navbar > .container-fluid .navbar-brand a {
-  color: #ffffff;
+  color: rgba(0,0,0, 0.65);
   font-size: 16px;
 }
 
@@ -7151,7 +7153,7 @@ body.inverse .fade-edge:after {
 }
 
 .navbar-default .navbar-nav > li > a {
-  color: #ffffff;
+  color: rgba(0,0,0, 0.65);
   text-transform: uppercase;
   padding: 0 15px;
   line-height: 40px;
@@ -7160,10 +7162,11 @@ body.inverse .fade-edge:after {
 
 .navbar-default .navbar-nav > li a:hover, .navbar-default .navbar-nav > li a:focus, .navbar-default .navbar-nav > li a:active {
   background: #0065a8;
-  color: #ffffff;
+  color: #008cc4;
 }
 .navbar-default .navbar-nav > li a:hover {
-  background: #798EA5;
+  background: #FFFFFF;
+  color: #008cc4;
 }
 
 .navbar-default .navbar-nav > .active > a, .navbar-default .navbar-nav > .active > a:hover, .navbar-default .navbar-nav > .active > a:focus, .navbar-default .navbar-nav > .active > a:active {
@@ -7171,7 +7174,7 @@ body.inverse .fade-edge:after {
   color: #ffffff;
 }
 .navbar-default .navbar-nav > .active > a:hover {
-  background: #424958;
+  background: #0280b3;
 }
 
 .navbar-collapse.dropdown {
@@ -7214,11 +7217,12 @@ body.inverse .fade-edge:after {
 }
 
 .navbar-collapse.tiles ul.nav li li a {
-  background: #526A84;
+  background: #008cc4;
 }
 
 .navbar-collapse.tiles ul.nav li a:hover {
-  background: #133e67;
+  background: #FFFFFF;
+  color: #008cc4
 }
 
 .navbar-collapse.tiles ul.nav li li a:hover {
@@ -7240,7 +7244,7 @@ body.inverse .fade-edge:after {
 .navbar-collapse.tiles ul.nav li.has-sub > a:after {
   width: 7px;
   height: 120px;
-  background: #526a84;
+  background: #008cc4;
   display: inline-block;
   content: " ";
   top: 0;
@@ -7348,11 +7352,12 @@ body.inverse .fade-edge:after {
   width: 350px;
   height: 100%;
   overflow-y: auto;
-  background: #222;
+  background: #FFFFFF;
   color: #ffffff;
   -webkit-transition: all 0.5s ease;
   -o-transition: all 0.5s ease;
   transition: all 0.5s ease;
+  box-shadow: 15px 15px 15px 10px rgba(0,21,41,.8);
 }
 
 .sidebar-wrapper.affix {
@@ -7794,8 +7799,8 @@ ul.sidebar-messages > li {
 }
 
 .pagination > .active > a, .pagination > .active > a:focus, .pagination > .active > a:hover, .pagination > .active > span, .pagination > .active > span:focus, .pagination > .active > span:hover {
-  background: #004675;
-  border-color: #004675;
+  background: #008cc4;
+  border-color: #008cc4;
 }
 
 .pagination > .disabled > a, .pagination > .disabled > a:focus, .pagination > .disabled > a:hover, .pagination > .disabled > span, .pagination > .disabled > span:focus, .pagination > .disabled > span:hover {
@@ -7980,7 +7985,7 @@ ul.tiles .icon {
 }
 @media only screen and (min-width: 1280px) {
   .modal-dialog {
-    width: 1000px;
+    width: 785px;
   }
 }
 /* ========================================================================
@@ -8049,7 +8054,7 @@ a.list-group-item:hover {
 .tree-view li > .icon {
   font-family: "font-wso2";
   font-style: normal;
-  background: #004675;
+  background: #008cc4;
   color: #ffffff;
   height: 20px;
   width: 20px;
@@ -8302,10 +8307,10 @@ a.list-group-item:hover {
   color: #8a8a8a;
 }
 .checkbox > input[type=checkbox]:not(:disabled) + .helper:before {
-  border-color: #526A84;
+  border-color: #008cc4;
 }
 .checkbox > input[type=checkbox] :not(:disabled) + .helper:before {
-  border-color: #526A84;
+  border-color: #008cc4;
 }
 .checkbox .helper {
   padding-left: 23px;
@@ -8910,8 +8915,8 @@ a.list-group-item:hover {
 
   .data-container .btn-primary {
     color: #ffffff;
-    background-color: #231F20;
-    border: 1px solid #231F20;
+    background-color: #008cc4;
+    border: 1px solid #008cc4;
     width: 100%;
   }
 
@@ -8925,7 +8930,7 @@ body.login-bg {
   background-color: #efefef;
 }
 #right-sidebar h4 a{
-    color:#526a84;
+    color:#008cc4;
 }
 #right-sidebar h4 a:hover,#right-sidebar h4 a:active{
     color:#798ea5;
@@ -8946,5 +8951,5 @@ body.login-bg {
 }
 
 .sidebar-messages + div > a.btn:hover,.sidebar-messages + div > .btn:hover{
-    background:#526a84;
+    background:#008cc4;
 }
\ No newline at end of file
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/favicon.png b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/favicon.png
index a1deab3581..43c53c4066 100644
Binary files a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/favicon.png and b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/favicon.png differ
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo-inverse.png b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo-inverse.png
new file mode 100644
index 0000000000..b4cba1d37c
Binary files /dev/null and b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo-inverse.png differ
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo-inverse.svg b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo-inverse.svg
deleted file mode 100644
index 72323a3fd0..0000000000
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo-inverse.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<svg version="1.1" id="wso2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="29 -6.639 72 27.639" enable-background="new 29 -6.639 72 27.639" xml:space="preserve">
-<g>
-	<circle fill="#F47B20" cx="82.076" cy="4.192" r="8.691"/>
-	<path d="M90.804,3.776l-0.01-0.115h-0.115c-0.53-0.001-1.061,0-1.594,0c-0.531,0-1.062,0-1.593,0h-0.073l-0.035,0.063
-		c-0.402,0.711-0.798,1.425-1.193,2.14L85.843,6.49c-0.601-1.454-1.198-2.908-1.795-4.363c-0.63-1.535-1.26-3.07-1.895-4.603
-		l-0.11-0.266l-0.119,0.262c-0.456,1.005-0.908,2.013-1.359,3.021c-0.62,1.383-1.261,2.812-1.905,4.212
-		c-0.897-0.008-1.794-0.007-2.695-0.006c-0.823,0.001-1.648,0.002-2.475-0.004l-0.128-0.001l0.002,0.128
-		c0.004,0.278,0.044,0.554,0.083,0.821l0.021,0.148h0.108c1.432-0.002,2.863-0.002,4.293-0.001h1.512l0.034-0.073
-		c0.44-0.972,0.878-1.947,1.316-2.921c0.421-0.938,0.842-1.875,1.267-2.811c0.643,1.552,1.279,3.106,1.917,4.661
-		c0.558,1.359,1.115,2.719,1.677,4.077l0.098,0.237l0.127-0.224c0.576-1.025,1.147-2.054,1.719-3.082l0.528-0.951
-		c0.876,0,1.751,0,2.625,0h0.115l0.01-0.115C90.834,4.383,90.832,4.11,90.804,3.776z"/>
-	<path fill="#F47B20" d="M29-6.61c0.849,0.001,1.696-0.002,2.545,0.002c2.065,5.082,4.121,10.169,6.198,15.247
-		c2.069-5.093,4.122-10.194,6.213-15.278c2.067,5.095,4.138,10.188,6.205,15.283c2.068-5.084,4.126-10.172,6.198-15.255
-		c0.857,0.001,1.716-0.002,2.573,0.001c-2.883,7.122-5.778,14.24-8.658,21.364c-0.008,0.103-0.157,0.273-0.192,0.074
-		c-2.042-5.053-4.094-10.1-6.127-15.157c-2.084,5.111-4.142,10.233-6.216,15.347C34.82,7.813,31.908,0.602,29-6.61z"/>
-	<path fill="#F47B20" d="M60.721-5.513c1.362-0.97,3.118-1.239,4.751-1.046c1.875,0.271,3.473,1.576,4.363,3.213
-		c-0.618,0.407-1.25,0.793-1.865,1.205c-0.329-0.36-0.55-0.802-0.893-1.15c-0.453-0.498-1.041-0.895-1.709-1.027
-		c-1.316-0.275-2.805,0.074-3.734,1.083c-0.996,1.055-1.006,3.01,0.193,3.919c0.841,0.609,1.756,1.108,2.677,1.586
-		c1.174,0.532,2.363,1.052,3.429,1.787c0.741,0.523,1.531,1.047,2,1.847c0.684,1.164,0.755,2.589,0.537,3.894
-		c-0.291,1.735-1.421,3.248-2.881,4.192c-1.289,0.842-2.883,1.128-4.401,0.968c-1.382-0.108-2.744-0.654-3.748-1.624
-		c-1.047-0.983-1.665-2.335-1.985-3.718c0.763-0.234,1.526-0.463,2.288-0.698c0.283,1.176,0.807,2.364,1.789,3.12
-		c0.933,0.742,2.211,0.893,3.355,0.68c1.338-0.239,2.507-1.217,3.011-2.474c0.314-0.84,0.416-1.786,0.158-2.653
-		c-0.175-0.6-0.595-1.103-1.111-1.443c-1.075-0.714-2.207-1.342-3.385-1.869c-0.904-0.408-1.784-0.874-2.603-1.436
-		c-0.654-0.453-1.336-0.917-1.767-1.604c-0.69-1.087-0.784-2.461-0.533-3.698C58.902-3.703,59.689-4.796,60.721-5.513z"/>
-	<path fill="#FFFFFF" d="M81.274-6.595c1.743-0.113,3.52,0.152,5.121,0.864c3.276,1.389,5.746,4.501,6.343,8.011
-		c0.419,2.347,0.048,4.832-1.074,6.939c-1.465,2.814-4.231,4.91-7.342,5.546c-2.047,0.43-4.217,0.261-6.168-0.498
-		c-1.884-0.728-3.556-1.996-4.76-3.617c-1.276-1.699-2.032-3.785-2.128-5.908c-0.145-2.528,0.646-5.1,2.194-7.105
-		C75.301-4.806,78.221-6.391,81.274-6.595z M79.977-4.147c-2.324,0.573-4.367,2.172-5.489,4.285
-		c-0.785,1.439-1.099,3.101-1.022,4.731h0.024c0.004,0.283,0.047,0.565,0.088,0.846c0.455,2.707,2.287,5.133,4.77,6.303
-		c1.988,0.968,4.358,1.12,6.453,0.409c1.752-0.574,3.295-1.744,4.35-3.254c0.934-1.328,1.469-2.926,1.538-4.546
-		c0.024-0.281,0.014-0.561-0.009-0.841c-0.083-1.637-0.639-3.25-1.596-4.581c-1.104-1.553-2.738-2.719-4.566-3.258
-		C83.049-4.491,81.462-4.526,79.977-4.147z"/>
-	<path fill="#FFFFFF" d="M93.688,3.448c1.131-0.311,2.351-0.314,3.479,0.015c1.542,0.453,2.786,1.721,3.318,3.223
-		c0.526,1.563,0.294,3.35-0.576,4.747c-0.709,1.137-1.603,2.146-2.506,3.132c-1.461,1.578-2.927,3.152-4.387,4.732
-		c2.661-0.004,5.322-0.001,7.983-0.002c-0.001,0.568,0.001,1.136-0.001,1.705c-3.943-0.004-7.886,0.003-11.829-0.003
-		c2.519-2.731,5.062-5.44,7.571-8.18c0.917-1.088,1.998-2.181,2.249-3.64c0.232-1.143-0.129-2.387-0.985-3.189
-		c-1.102-1.147-2.93-1.389-4.359-0.759C93.685,4.637,93.755,4.04,93.688,3.448z"/>
-</g>
-</svg>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo.png b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo.png
new file mode 100644
index 0000000000..b4cba1d37c
Binary files /dev/null and b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo.png differ
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo.svg b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo.svg
deleted file mode 100644
index f7188ed8ab..0000000000
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/images/logo.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<svg version="1.1" id="wso2" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="29 -6.639 72 27.639" enable-background="new 29 -6.639 72 27.639" xml:space="preserve">
-<circle fill="#F47B20" cx="82.076" cy="4.192" r="8.691"/>
-<path fill="#FFFFFF" d="M90.804,3.776l-0.01-0.115h-0.115c-0.53-0.001-1.061,0-1.594,0c-0.531,0-1.062,0-1.593,0h-0.073
-	l-0.035,0.063c-0.402,0.711-0.798,1.425-1.193,2.14L85.843,6.49c-0.601-1.454-1.198-2.908-1.795-4.363
-	c-0.63-1.535-1.26-3.07-1.895-4.603l-0.11-0.266L81.924-2.48c-0.456,1.005-0.908,2.013-1.359,3.021
-	c-0.62,1.383-1.261,2.812-1.905,4.212c-0.897-0.008-1.794-0.007-2.695-0.006c-0.823,0.001-1.648,0.002-2.475-0.004l-0.128-0.001
-	l0.002,0.128c0.004,0.278,0.044,0.554,0.083,0.821l0.021,0.148h0.108c1.432-0.002,2.863-0.002,4.293-0.001h1.512l0.034-0.073
-	c0.44-0.972,0.878-1.947,1.316-2.921c0.421-0.938,0.842-1.875,1.267-2.811c0.643,1.552,1.279,3.106,1.917,4.661
-	c0.558,1.359,1.115,2.719,1.677,4.077l0.098,0.237l0.127-0.224c0.576-1.025,1.147-2.054,1.719-3.082l0.528-0.951
-	c0.876,0,1.751,0,2.625,0h0.115l0.01-0.115C90.834,4.383,90.831,4.109,90.804,3.776z"/>
-<path fill="#F47B20" d="M29-6.61c0.849,0.001,1.696-0.002,2.545,0.002c2.065,5.082,4.121,10.169,6.198,15.247
-	c2.069-5.093,4.122-10.194,6.213-15.278c2.067,5.095,4.138,10.188,6.205,15.283c2.068-5.084,4.126-10.172,6.198-15.255
-	c0.857,0.001,1.716-0.002,2.573,0.001c-2.883,7.122-5.778,14.24-8.658,21.364c-0.008,0.103-0.157,0.273-0.192,0.074
-	c-2.042-5.053-4.094-10.1-6.127-15.157c-2.084,5.111-4.142,10.233-6.216,15.347C34.82,7.812,31.908,0.602,29-6.61z"/>
-<path fill="#F47B20" d="M60.721-5.513c1.362-0.97,3.118-1.239,4.751-1.046c1.875,0.271,3.473,1.576,4.363,3.213
-	c-0.618,0.407-1.25,0.793-1.865,1.205c-0.329-0.36-0.55-0.802-0.893-1.15c-0.453-0.498-1.041-0.895-1.709-1.027
-	c-1.316-0.275-2.805,0.074-3.734,1.083c-0.996,1.055-1.006,3.01,0.193,3.919c0.841,0.609,1.756,1.108,2.677,1.586
-	c1.174,0.532,2.363,1.052,3.429,1.787c0.741,0.523,1.531,1.047,2,1.847c0.684,1.164,0.755,2.589,0.537,3.894
-	c-0.291,1.735-1.421,3.248-2.881,4.192c-1.289,0.842-2.883,1.128-4.401,0.968c-1.382-0.108-2.744-0.654-3.748-1.624
-	c-1.047-0.983-1.665-2.335-1.985-3.718c0.763-0.234,1.526-0.463,2.288-0.698c0.283,1.176,0.807,2.364,1.789,3.12
-	c0.933,0.742,2.211,0.893,3.355,0.68c1.338-0.239,2.507-1.217,3.011-2.474c0.314-0.84,0.416-1.786,0.158-2.653
-	c-0.175-0.6-0.595-1.103-1.111-1.443c-1.075-0.714-2.207-1.342-3.385-1.869c-0.904-0.408-1.784-0.874-2.603-1.436
-	c-0.654-0.453-1.336-0.917-1.767-1.604c-0.69-1.087-0.784-2.461-0.533-3.698C58.902-3.703,59.689-4.796,60.721-5.513z"/>
-<path fill="#060709" d="M81.274-6.596c1.743-0.113,3.52,0.152,5.121,0.864c3.276,1.389,5.746,4.501,6.343,8.011
-	c0.419,2.347,0.048,4.832-1.074,6.939c-1.465,2.814-4.231,4.91-7.342,5.546c-2.047,0.43-4.217,0.261-6.168-0.498
-	c-1.884-0.728-3.556-1.996-4.76-3.617c-1.276-1.699-2.032-3.785-2.128-5.908c-0.145-2.528,0.646-5.1,2.194-7.105
-	C75.301-4.806,78.221-6.391,81.274-6.596z M79.977-4.147c-2.324,0.573-4.367,2.172-5.489,4.285
-	c-0.785,1.439-1.099,3.101-1.022,4.731h0.024c0.004,0.283,0.047,0.565,0.088,0.846c0.455,2.707,2.287,5.133,4.77,6.303
-	c1.988,0.968,4.358,1.12,6.453,0.409c1.752-0.574,3.295-1.744,4.35-3.254c0.934-1.328,1.469-2.926,1.538-4.546
-	c0.024-0.281,0.014-0.561-0.009-0.841c-0.083-1.637-0.639-3.25-1.596-4.581c-1.104-1.553-2.738-2.719-4.566-3.258
-	C83.049-4.491,81.462-4.526,79.977-4.147z"/>
-<path fill="#060709" d="M93.688,3.447c1.131-0.311,2.351-0.314,3.479,0.015c1.542,0.453,2.786,1.721,3.318,3.223
-	c0.526,1.563,0.294,3.35-0.576,4.747c-0.709,1.137-1.603,2.146-2.506,3.132c-1.461,1.578-2.927,3.152-4.387,4.732
-	c2.661-0.004,5.322-0.001,7.983-0.002c-0.001,0.568,0.001,1.136-0.001,1.705c-3.943-0.004-7.886,0.003-11.829-0.003
-	c2.519-2.731,5.062-5.44,7.571-8.18c0.917-1.088,1.998-2.181,2.249-3.64c0.232-1.143-0.129-2.387-0.985-3.189
-	c-1.102-1.147-2.93-1.389-4.359-0.759C93.685,4.637,93.755,4.04,93.688,3.447z"/>
-</svg>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/less/theme-wso2.less b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/less/theme-wso2.less
index 61c1527f74..1f87dd8a34 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/less/theme-wso2.less
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/lib/theme-wso2_1.0/less/theme-wso2.less
@@ -1724,7 +1724,7 @@ input[type=number].form-control {
 
 .table.list-table:not(.grid-view) {
     & > tbody > tr > td,
-    & > tbody > tr > th,{
+    & > tbody > tr > th{
         background: #f5f5f5;
 
         &.fade-edge:after {
diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/email/templates/user-enrollment.vm b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/email/templates/user-enrollment.vm
index 61cc9340d4..69aad7b830 100644
--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/email/templates/user-enrollment.vm
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/email/templates/user-enrollment.vm
@@ -21,7 +21,7 @@
     <![CDATA[
     <html>
     <head>
-        <title>WSO2 IoT Server</title>
+        <title>Entgra IoT Server</title>
     </head>
     <body style="color: #666666; background-color:#cdcdcd; padding: 0px; margin: 0px;">
     <div style="background-color:#cdcdcd; font-size: 1em; font-family: Arial, Helvetica; line-height: 170%; color: #666666; padding: 20px 0px; margin: 0px;">