diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/device_icons/TemperatureController.png b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/device_icons/TemperatureController.png
deleted file mode 100644
index e16b48d8e..000000000
Binary files a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/device_icons/TemperatureController.png and /dev/null differ
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/device_icons/android.png b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/device_icons/android.png
deleted file mode 100644
index 7fee78a64..000000000
Binary files a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/device_icons/android.png and /dev/null differ
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/device_icons/ios.png b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/device_icons/ios.png
deleted file mode 100644
index 4b09796f8..000000000
Binary files a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/device_icons/ios.png and /dev/null differ
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/graph.png b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/graph.png
deleted file mode 100644
index dd819ef4f..000000000
Binary files a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/public/img/graph.png and /dev/null differ
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.js
index 0373b6eb6..ecb98e08f 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.device.view/view.js
@@ -53,8 +53,8 @@ function onRequest(context) {
                     };
                 } else if (device["type"] == "android") {
                     viewModel["imei"] = device["properties"]["IMEI"];
-                    viewModel["model"] = device["properties"]["DEVICE_MODEL"];
-                    viewModel["vendor"] = device["properties"]["VENDOR"];
+                    viewModel["model"] = device["deviceInfo"]["deviceModel"];
+                    viewModel["vendor"] = device["deviceInfo"]["vendor"];
                     var osBuildDate = device["properties"]["OS_BUILD_DATE"];
                     if (osBuildDate != null && osBuildDate != "0") {
                         viewModel["os_build_date"] = new Date(osBuildDate * 1000);
@@ -73,17 +73,17 @@ function onRequest(context) {
                         }
                     }
                     deviceInfo = info;
-                    viewModel["BatteryLevel"] = deviceInfo["BATTERY_LEVEL"];
+                    viewModel["BatteryLevel"] = device["deviceInfo"]["batteryLevel"];
                     viewModel["internal_memory"]["FreeCapacity"] = Math.
-                        round(deviceInfo["INTERNAL_AVAILABLE_MEMORY"] * 100)/100;
+                        round(device["deviceInfo"]["internalAvailableMemory"] * 100)/100;
                     viewModel["internal_memory"]["DeviceCapacityPercentage"] = Math.
-                        round(deviceInfo["INTERNAL_AVAILABLE_MEMORY"]
-                            / deviceInfo["INTERNAL_TOTAL_MEMORY"] * 10000) / 100;
+                        round(device["deviceInfo"]["internalAvailableMemory"]
+                            / device["deviceInfo"]["internalTotalMemory"] * 10000) / 100;
                     viewModel["external_memory"]["FreeCapacity"] = Math.
                         round(deviceInfo["EXTERNAL_AVAILABLE_MEMORY"] * 100) / 100;
                     viewModel["external_memory"]["DeviceCapacityPercentage"] = Math.
-                        round(deviceInfo["EXTERNAL_AVAILABLE_MEMORY"]
-                            / deviceInfo["EXTERNAL_TOTAL_MEMORY"] * 10000) / 100;
+                        round(device["deviceInfo"]["externalAvailableMemory"]
+                            / device["deviceInfo"]["externalTotalMemory"] * 10000) / 100;
                 } else if (device["type"] == "windows") {
                     viewModel["imei"] = device["properties"]["IMEI"];
                     viewModel["model"] = device["properties"]["DEVICE_MODEL"];