diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.overview-section/overview-section.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.overview-section/overview-section.hbs
index 67ac3d15b5..e122c8539f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.overview-section/overview-section.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.overview-section/overview-section.hbs
@@ -23,18 +23,5 @@
         <td style="padding:10px 15px;">{{this}}</td>
       </tr>
     {{/each}}
-    <tr role="row" class="even">
-        <td class="sorting_1" style="padding:10px 15px;">Status</td>
-        <td style="padding:10px 15px;">
-          {{#equal device.enrolmentInfo.status "ACTIVE"}}<span><i
-                  class="fw fw-success icon-success"></i> Active</span>{{/equal}}
-          {{#equal device.enrolmentInfo.status "INACTIVE"}}<span><i
-                  class="fw fw-warning icon-warning"></i> Inactive</span>{{/equal}}
-          {{#equal device.enrolmentInfo.status "BLOCKED"}}<span><i
-                  class="fw fw-remove icon-danger"></i> Blocked</span>{{/equal}}
-          {{#equal device.enrolmentInfo.status "REMOVED"}}<span><i
-                  class="fw fw-delete icon-danger"></i> Removed</span>{{/equal}}
-        </td>
-    </tr>
     </tbody>
 </table>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.device-view/device-view.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.device-view/device-view.hbs
index 54725160d5..d4491a3f33 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.device-view/device-view.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.device-view/device-view.hbs
@@ -34,25 +34,22 @@
     </style>
 {{/zone}}
 
-{{#zone "overview-section"}}
-    <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
-        Device Overview - {{device.type}}</div>
-    {{unit "cdmf.unit.default.device.overview-section" device=device}}
-{{/zone}}
-
 {{#zone "device-thumbnail"}}
-    <img src="{{@unit.publicUri}}/images/deviceType.png"/>
+    <i class='square-element text fw fw-devices' style='font-size: 74px;'></i>
 {{/zone}}
 
+{{#zone "device-details"}}
+    {{unit "cdmf.unit.default.device.overview-section" device=device}}
+{{/zone}}
 
 {{#zone "device-opetations"}}
     {{#if features}}
-    <div style="background: #11375B; color: #fff; padding: 10px; margin-bottom: 5px">
-        Operations
-    </div>
-    <div class="add-margin-top-4x">
-        {{unit "cdmf.unit.default.device.operation-bar" device=device features=features}}
-    </div>
+        <div class="operation-container">
+            <div class="operation-title">
+                <h4>Device Operations</h4>
+            </div>
+            {{unit "cdmf.unit.default.device.operation-bar" device=device features=features}}
+        </div>
     {{/if}}
 {{/zone}}
 
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.device-view/public/images/deviceType.png b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.device-view/public/images/deviceType.png
index ad3f3a5d01..71e5c0c28b 100644
Binary files a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.device-view/public/images/deviceType.png and b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.default.device.type.device-view/public/images/deviceType.png differ
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/images/deviceType.png 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/images/deviceType.png
old mode 100755
new mode 100644
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/images/thumb.png 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/images/thumb.png
index ad3f3a5d01..71e5c0c28b 100644
Binary files 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/images/thumb.png and 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/images/thumb.png differ