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 8afcca89cec..0fede3d552a 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
@@ -69,7 +69,7 @@
 }
 
 .itm-wiz {
-    font-weight: 100;
+    font-weight: 300;
 }
 
 .itm-wiz div {
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 4d09c238dd8..288b74b8e68 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
@@ -3369,7 +3369,7 @@ span.ico-sort-desc {
 }
 
 .wr-input-label {
-    font-weight:100;
+    font-weight:300;
     font-size:14px;
     color:#555;
 }
@@ -4060,7 +4060,7 @@ a.wr-side-panel-toggle-btn.selected {
 .wr-input-control.switch .text {
     display: none;
     margin-left: 5px;
-    font-weight: 100;
+    font-weight: 400;
 }
 
 .wr-input-control.switch input[type="checkbox"]:checked + .helper + .text {
@@ -4606,28 +4606,26 @@ a.wr-side-panel-toggle-btn.selected {
 }
 
 .wr-hidden-operations-content .panel-body {
-    margin: 5px;
-    /*border: 1px solid #e8e8e8;*/
-    padding: 5px 20px 30px;
+    padding: 0px 20px 20px;
     background: #ffffff;
 }
-
+.wr-hidden-operations-content .panel-body hr{
+    margin:0px;
+    margin-bottom:20px;
+}
 .wr-advance-operations.wizard-content .panel-title .fw-stack {
     width: 5px;
 }
 
 .wr-hidden-operations-content .sub-title {
-    font-size: 16px;
+    font-size: 18px;
 }
 
 .wr-hidden-operations-content .panel-title {
-    margin-left: 5px;
-    margin-top: 5px;
-    margin-right: 5px;
-    /*border: 1px solid #e8e8e8;*/
     padding: 20px;
     background: #ffffff;
     color: #555;
+    font-weight:400;
 }
 
 .panel-title hr{
@@ -4635,10 +4633,13 @@ a.wr-side-panel-toggle-btn.selected {
 }
 
 .wr-hidden-operations-content .panel-title-description {
-    padding-right: 20px;
+    font-size: 16px;
+    padding:0px 20px;
     background: #ffffff;
     color: #555;
     line-height: 140%;
+    font-weight:300;
+    text-align:justify;
 }
 
 .wr-hidden-operations-content .panel-title a {
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 a6db82b4c6f..a7264020b96 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
@@ -5195,6 +5195,7 @@ button.list-group-item-danger.active:focus {
   color: #333333;
   background-color: #f5f5f5;
   border-color: #ddd;
+  border:none;
 }
 .panel-default > .panel-heading + .panel-collapse > .panel-body {
   border-top-color: #ddd;
@@ -8084,7 +8085,7 @@ a.list-group-item:hover {
  * ======================================================================== */
 .switch {
   display: inline-block;
-  width: 40px;
+  width: 90px;
   cursor: pointer;
   position: relative;
   margin-top: -4px;
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 1e51ba60afa..80f7cfe4691 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
@@ -35,7 +35,7 @@
 @base-dark-color: #222;
 @base-light-color: #ffffff;
 @base-success-color: #5cb85c;
-@base-info-color: #009DA7;
+@base-info-color: #526A84;
 @base-warning-color: #f0ad4e;
 @base-danger-color: #d9534f;