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 49ada6fc1e..6f89f73627 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
@@ -3042,14 +3042,7 @@ a.list-group-item:hover {
   left: 0;
 }
 
-@media (min-width: 768px) {
-  .tab-content > .tab-pane {
-    display: none !important;
-  }
-  .tab-content > .active {
-    display: block !important;
-  }
-}
+
 .wr-content {
     padding-top: 10px;
 }
@@ -4313,6 +4306,13 @@ a.wr-side-panel-toggle-btn.selected {
     height: 110px;
     margin-bottom: 10px;
 }
+.device-detail-body .wr-stats-board-tile {
+    background: #e2e2e2;
+    color: #333;
+    padding: 15px;
+    height: 110px;
+    margin-bottom: 10px;
+}
 
 .wr-stats-board .tiles .row {
     margin: 0 -5px;
@@ -6905,15 +6905,19 @@ ul.tiles .icon {
 
 .media .panel-group.tab-content{
      position: relative;
-     background: #f4f4f4;
-     border: 1px solid #ddd;
+     border: none;
+     margin-bottom:0px;
  }
  .media .panel-group .panel-heading{
-    padding:10px;
+    padding:0px;
     margin-bottom:0px;
  }
+ .media .panel-group .panel-heading.display-none-xs{
+     padding:10px;
+     margin-bottom:0px;
+  }
  .media .panel.active .panel-heading.visible-xs{
-    background:#2c313b;
+    background:#11375b;
     color:#fff;
  }
   .media .panel-heading{
@@ -6930,11 +6934,13 @@ ul.tiles .icon {
      height: 0px;
      border-top: 10px solid transparent;
      border-bottom: 10px solid transparent;
-     border-right: 10px solid #f4f4f4;
+     border-right: 10px solid #ddd;
  }
 
  .media .panel-group.tab-content .panel{
-     background:none;
+     background: #f4f4f4;
+     border:1px solid #ddd;
+     margin-bottom:10px;
  }
  .media .list-group-item a, .media .list-group-item a{
      background:#f4f4f4;
@@ -6947,7 +6953,7 @@ ul.tiles .icon {
      margin-top:0px;
  }
  .media .panel-group .panel-body{
-     margin-bottom:40px;
+     /*margin-bottom:40px;*/
  }
  .media .panel-group .panel-body .thumbnail.icon{
      margin-bottom:10px;
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 39d6f1b6ca..a126a734fd 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
@@ -3525,13 +3525,6 @@ tbody.collapse.in {
   }
 }
 
-.tab-content > .tab-pane {
-  display: none;
-}
-.tab-content > .active {
-  display: block;
-}
-
 .nav-tabs .dropdown-menu {
   margin-top: -1px;
   border-top-right-radius: 0;
@@ -8295,15 +8288,7 @@ a.list-group-item:hover {
   left: 0;
 }
 
-@media (min-width: 768px) {
-  .tab-content > .tab-pane {
-    display: none !important;
-  }
 
-  .tab-content > .active {
-    display: block !important;
-  }
-}
 /* ========================================================================
  * Misc customizations
  * ======================================================================== */