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.policy.create/create.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.hbs
index 8296cccbf..61c0a85ce 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.hbs
@@ -265,8 +265,8 @@
                                            data-next="policy-profile"
                                            data-platform="{{name}}"
                                            data-validate="false">
-                                            <img src="{{icon}}" width="50px" height="50px" />
-                                            <br><br>
+                                            <!--<img src="{{icon}}" width="50px" height="50px" />-->
+                                            <i class="fw fw-{{deviceTypeIcon}}"></i>
                                             <b>{{label}}</b>
                                         </a>
                                     </li>
@@ -295,4 +295,3 @@
             type="text/x-handlebars-template"></script>
     {{js "/js/policy-create.js"}}
 {{/zone}}
-
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.policy.create/create.js b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.js
index 82ae71a83..5072ac956 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.js
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/units/mdm.unit.policy.create/create.js
@@ -17,7 +17,7 @@
  */
 
 function onRequest() {
-    var log = new Log("/app/units/mdm.unit.policy.create");
+    // var log = new Log("/app/units/mdm.unit.policy.create");
 
     var CONF_DEVICE_TYPE_KEY = "deviceType";
     var CONF_DEVICE_TYPE_LABEL_KEY = "label";
@@ -35,6 +35,11 @@ function onRequest() {
             var content = {};
             var deviceType = deviceTypes[i];
             content["name"] = deviceType;
+            if (deviceType == "ios") {
+                content["deviceTypeIcon"] = "apple";
+            } else {
+                content["deviceTypeIcon"] = deviceType;
+            }
             var configs = utility.getDeviceTypeConfig(deviceType);
             var deviceTypeLabel = deviceType;
             if (configs && configs[CONF_DEVICE_TYPE_KEY][CONF_DEVICE_TYPE_LABEL_KEY]) {
@@ -43,7 +48,7 @@ function onRequest() {
             var policyWizard = new File("/app/units/" + utility.getTenantedDeviceUnitName(deviceType, "policy-wizard"));
 
             if (policyWizard.isExists()) {
-                content["icon"] = utility.getDeviceThumb(deviceType);
+                // content["icon"] = utility.getDeviceThumb(deviceType);
                 content["label"] = deviceTypeLabel;
                 viewModelData["types"].push(content);
             }