diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
index 14a2c0a6d..ca9a91d54 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/device-view.hbs
@@ -52,7 +52,7 @@
                             <td class="sorting_1" style="padding:10px 15px; width: 15%;">Status</td>
                             <td style="padding:10px 15px;">
                                 {{#equal device.status "ACTIVE"}}<span><i
-                                        class="fw fw-ok icon-success"></i>Active</span>{{/equal}}
+                                        class="fw fw-success icon-success"></i>Active</span>{{/equal}}
                                 {{#equal device.status "INACTIVE"}}<span><i
                                         class="fw fw-warning icon-warning"></i>Inactive</span>{{/equal}}
                                 {{#equal device.status "BLOCKED"}}<span><i
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
index 0c08e071e..449dec84c 100755
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/js/device-detail.js
@@ -157,7 +157,7 @@ var InitiateViewOption = null;
                         var html;
                         switch (status) {
                             case "COMPLETED" :
-                                html = "<span><i class='fw fw-ok icon-success'></i> Completed</span>";
+                                html = "<span><i class='fw fw-success icon-success'></i> Completed</span>";
                                 break;
                             case "PENDING" :
                                 html = "<span><i class='fw fw-warning icon-warning'></i> Pending</span>";
@@ -166,10 +166,10 @@ var InitiateViewOption = null;
                                 html = "<span><i class='fw fw-error icon-danger'></i> Error</span>";
                                 break;
                             case "IN_PROGRESS" :
-                                html = "<span><i class='fw fw-ok icon-warning'></i> In Progress</span>";
+                                html = "<span><i class='fw fw-success icon-warning'></i> In Progress</span>";
                                 break;
                             case "REPEATED" :
-                                html = "<span><i class='fw fw-ok icon-warning'></i> Repeated</span>";
+                                html = "<span><i class='fw fw-success icon-warning'></i> Repeated</span>";
                                 break;
                         }
                         return html;
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/applications-list.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/applications-list.hbs
index 3b55136af..ec6029dcc 100755
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/applications-list.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/applications-list.hbs
@@ -7,7 +7,7 @@
                 {{#equal platform "windows"}}<i class="icon fw fw-windows"></i>{{/equal}}
                 {{#equal isActive true}}
                     <span style="word-wrap: break-word;">
-                            <i class="fw fw-ok icon-success" style="font-size: 14px;"></i>
+                            <i class="fw fw-success icon-success" style="font-size: 14px;"></i>
                             &nbsp;Active
                         </span>
                     <span style="word-wrap: break-word;"><b>{{name}}</b></span>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/policy-compliance.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/policy-compliance.hbs
index bae2aeb24..8fba741a6 100755
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/policy-compliance.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.device-view/public/templates/policy-compliance.hbs
@@ -34,7 +34,7 @@
                     <div>
                         <b>Compliance :</b>
                         {{#equal compliance "COMPLIANT"}}
-                            <span><i class="fw fw-ok icon-success"></i> Compliant</span>
+                            <span><i class="fw fw-success icon-success"></i> Compliant</span>
                         {{/equal}}
                         {{#equal compliance "NON-COMPLIANT"}}
                             <span><i class="fw fw-warning icon-danger"></i> Not Compliant</span>
@@ -70,7 +70,7 @@
         <tr data-type="selectable">
             <td data-display="{{featureCode}}" data-grid-label="Feature Code">{{featureCode}}</td>
             <td data-display="{{compliance}}" data-grid-label="Status">
-                {{#equal compliance true}}<span><i class="fw fw-ok icon-success"></i> Compliant</span>{{/equal}}
+                {{#equal compliance true}}<span><i class="fw fw-success icon-success"></i> Compliant</span>{{/equal}}
                 {{#equal compliance false}}<span><i class="fw fw-warning icon-danger"></i> Not Compliant</span>{{/equal}}
             </td>
         </tr>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
index 2d4431205..b6aba2f23 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-edit/public/templates/android-policy-edit.hbs
@@ -23,8 +23,8 @@
                 </span>
             Passcode Policy
             <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('camera', this)">
@@ -32,8 +32,8 @@
                     <i class="fw fw-block fw-stack-2x"></i>
                 </span>
             Restrictions
-            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span class="camera-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('encrypt-storage', this)">
@@ -42,8 +42,8 @@
                 </span>
             Encryption Settings
             <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
@@ -52,8 +52,8 @@
                     <i class="fw fw-wifi fw-stack-2x"></i>
                 </span>
             Wi-Fi Settings
-            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('vpn', this)">
@@ -61,8 +61,8 @@
                     <i class="fw fw-vpn fw-stack-2x"></i>
                 </span>
             Virtual Private Network
-            <span id="vpn-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="vpn-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="vpn-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="vpn-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="vpn-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('work-profile', this)">
@@ -70,8 +70,8 @@
                  <i class="fw fw-service fw-stack-2x"></i>
              </span>
             Work-Profile Configurations
-            <span id="work-profile-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="work-profile-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="work-profile-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('app-restriction', this)">
@@ -81,8 +81,8 @@
             </span>
             Application Restrictions
             <span id="app-restriction-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)">
@@ -91,9 +91,9 @@
             </span>
             System Update Policy (COSU)
             <span id="cosu-system-update-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
             <span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
             <span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)" >
@@ -102,8 +102,8 @@
             </span>
             Whitelist Apps (COSU)
             <span id="cosu-whitelisted-applications-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
index 45da8379c..2037c9c1c 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-view/public/templates/android-policy-view.hbs
@@ -6,8 +6,8 @@
                 </span>
             Passcode Policy
             <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('camera', this)">
@@ -15,8 +15,8 @@
                     <i class="fw fw-block fw-stack-2x"></i>
                 </span>
             Restrictions
-            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span class="camera-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('encrypt-storage', this)">
@@ -25,8 +25,8 @@
                 </span>
             Encryption Settings
             <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
@@ -35,8 +35,8 @@
                     <i class="fw fw-wifi fw-stack-2x"></i>
                 </span>
             Wi-Fi Settings
-            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('vpn', this)">
@@ -44,8 +44,8 @@
                     <i class="fw fw-vpn fw-stack-2x"></i>
                 </span>
             Virtual Private Network
-            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('work-profile', this)">
@@ -53,8 +53,8 @@
                  <i class="fw fw-service fw-stack-2x"></i>
              </span>
             Work-Profile Configurations
-            <span id="work-profile-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="work-profile-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="work-profile-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('app-restriction', this)">
@@ -64,8 +64,8 @@
             </span>
             Applications Restrictions
             <span id="app-restriction-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)" class="hide">
@@ -74,9 +74,9 @@
             </span>
             System Update Policy (COSU)
             <span id="cosu-system-update-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
             <span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
             <span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)" class="hide">
@@ -85,8 +85,8 @@
             </span>
             Whitelist Apps (COSU)
             <span id="cosu-whitelisted-applications-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
diff --git a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
index 2a3a18598..1f58ea329 100644
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.policy-wizard/public/templates/android-policy-operations.hbs
@@ -23,8 +23,8 @@
                 </span>
             Passcode Policy
             <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('camera', this)">
@@ -32,8 +32,8 @@
                     <i class="fw fw-block fw-stack-2x"></i>
                 </span>
             Restrictions
-            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span class="camera-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('encrypt-storage', this)">
@@ -42,8 +42,8 @@
                 </span>
             Encryption Settings
             <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
@@ -52,8 +52,8 @@
                     <i class="fw fw-wifi fw-stack-2x"></i>
                 </span>
             Wi-Fi Settings
-            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="wifi-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="wifi-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="wifi-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('vpn', this)">
@@ -61,8 +61,8 @@
                     <i class="fw fw-vpn fw-stack-2x"></i>
                 </span>
             Virtual Private Network
-            <span id="vpn-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="vpn-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="vpn-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="vpn-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="vpn-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('work-profile', this)">
@@ -70,8 +70,8 @@
                  <i class="fw fw-service fw-stack-2x"></i>
              </span>
             Work-Profile Configurations
-            <span id="work-profile-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="work-profile-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="work-profile-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="work-profile-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('app-restriction', this)">
@@ -81,8 +81,8 @@
             </span>
             Application Restrictions
             <span id="app-restriction-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-system-update-policy', this)">
@@ -91,9 +91,9 @@
             </span>
             System Update Policy (COSU)
             <span id="cosu-system-update-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
             <span id="cosu-system-update-policy-ok" class="has-success status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
             <span id="cosu-system-update-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('cosu-whitelisted-applications', this)">
@@ -102,8 +102,8 @@
             </span>
             Whitelist Apps (COSU)
             <span id="cosu-whitelisted-applications-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="cosu-whitelisted-applications-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="cosu-whitelisted-applications-error" class="has-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.hbs
index cb00b423a..fe897ac41 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/device-view.hbs
@@ -52,7 +52,7 @@
                             <td class="sorting_1" style="padding:10px 15px; width: 15%;">Status</td>
                             <td style="padding:10px 15px;">
                                 {{#equal device.status "ACTIVE"}}<span><i
-                                        class="fw fw-ok icon-success"></i>Active</span>{{/equal}}
+                                        class="fw fw-success icon-success"></i>Active</span>{{/equal}}
                                 {{#equal device.status "INACTIVE"}}<span><i
                                         class="fw fw-warning icon-warning"></i>Inactive</span>{{/equal}}
                                 {{#equal device.status "BLOCKED"}}<span><i
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js
index b6ae3ce2d..0e2375033 100755
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/js/device-detail.js
@@ -157,7 +157,7 @@ var InitiateViewOption = null;
                         var html;
                         switch (status) {
                             case "COMPLETED" :
-                                html = "<span><i class='fw fw-ok icon-success'></i> Completed</span>";
+                                html = "<span><i class='fw fw-success icon-success'></i> Completed</span>";
                                 break;
                             case "PENDING" :
                                 html = "<span><i class='fw fw-warning icon-warning'></i> Pending</span>";
@@ -166,10 +166,10 @@ var InitiateViewOption = null;
                                 html = "<span><i class='fw fw-error icon-danger'></i> Error</span>";
                                 break;
                             case "IN_PROGRESS" :
-                                html = "<span><i class='fw fw-ok icon-warning'></i> In Progress</span>";
+                                html = "<span><i class='fw fw-success icon-warning'></i> In Progress</span>";
                                 break;
                             case "REPEATED" :
-                                html = "<span><i class='fw fw-ok icon-warning'></i> Repeated</span>";
+                                html = "<span><i class='fw fw-success icon-warning'></i> Repeated</span>";
                                 break;
                         }
                         return html;
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/applications-list.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/applications-list.hbs
index 3b55136af..ec6029dcc 100755
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/applications-list.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/applications-list.hbs
@@ -7,7 +7,7 @@
                 {{#equal platform "windows"}}<i class="icon fw fw-windows"></i>{{/equal}}
                 {{#equal isActive true}}
                     <span style="word-wrap: break-word;">
-                            <i class="fw fw-ok icon-success" style="font-size: 14px;"></i>
+                            <i class="fw fw-success icon-success" style="font-size: 14px;"></i>
                             &nbsp;Active
                         </span>
                     <span style="word-wrap: break-word;"><b>{{name}}</b></span>
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/policy-compliance.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/policy-compliance.hbs
index ec24e1ca6..1eb233dfe 100755
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/policy-compliance.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.device-view/public/templates/policy-compliance.hbs
@@ -34,7 +34,7 @@
                     <div>
                         <b>Compliance :</b>
                         {{#equal compliance "COMPLIANT"}}
-                            <span><i class="fw fw-ok icon-success"></i> Compliant</span>
+                            <span><i class="fw fw-success icon-success"></i> Compliant</span>
                         {{/equal}}
                         {{#equal compliance "NON-COMPLIANT"}}
                             <span><i class="fw fw-warning icon-danger"></i> Not Compliant</span>
@@ -69,7 +69,7 @@
         <tr data-type="selectable">
             <td data-display="{{featureCode}}" data-grid-label="Feature Code">{{featureCode}}</td>
             <td data-display="{{compliance}}" data-grid-label="Status">
-                {{#equal compliance true}}<span><i class="fw fw-ok icon-success"></i> Compliant</span>{{/equal}}
+                {{#equal compliance true}}<span><i class="fw fw-success icon-success"></i> Compliant</span>{{/equal}}
                 {{#equal compliance false}}<span><i class="fw fw-warning icon-danger"></i> Not Compliant</span>{{/equal}}
             </td>
         </tr>
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-edit/public/templates/windows-policy-edit.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-edit/public/templates/windows-policy-edit.hbs
index dd6361276..7e98d5019 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-edit/public/templates/windows-policy-edit.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-edit/public/templates/windows-policy-edit.hbs
@@ -5,8 +5,8 @@
                     <i class="fw fw-key fw-stack-2x"></i>
                 </span>Passcode Policy
             <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('camera', this)">
@@ -14,8 +14,8 @@
                     <i class="fw fw-block fw-stack-2x"></i>
                 </span>
             Restrictions on Camera
-            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span class="camera-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('encrypt-storage', this)">
@@ -24,8 +24,8 @@
                 </span>
             Encryption Settings
             <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
@@ -36,8 +36,8 @@
                 </span>
             Applications Restrictions
             <span id="app-restriction-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
     </div>
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-view/public/templates/windows-policy-view.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-view/public/templates/windows-policy-view.hbs
index f764fafaf..2d6c205ef 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-view/public/templates/windows-policy-view.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-view/public/templates/windows-policy-view.hbs
@@ -6,8 +6,8 @@
                 </span>
             Passcode Policy
             <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('camera', this)">
@@ -15,8 +15,8 @@
                     <i class="fw fw-block fw-stack-2x"></i>
                 </span>
             Restrictions on Camera
-            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span class="camera-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('encrypt-storage', this)">
@@ -25,8 +25,8 @@
                 </span>
             Encryption Settings
             <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
@@ -37,8 +37,8 @@
                 </span>
             Applications Restrictions
             <span id="app-restriction-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
     </div>
diff --git a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-wizard/public/templates/windows-policy-operations.hbs b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-wizard/public/templates/windows-policy-operations.hbs
index dd6361276..7e98d5019 100644
--- a/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-wizard/public/templates/windows-policy-operations.hbs
+++ b/components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.windows.policy-wizard/public/templates/windows-policy-operations.hbs
@@ -5,8 +5,8 @@
                     <i class="fw fw-key fw-stack-2x"></i>
                 </span>Passcode Policy
             <span id="passcode-policy-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="passcode-policy-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="passcode-policy-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('camera', this)">
@@ -14,8 +14,8 @@
                     <i class="fw fw-block fw-stack-2x"></i>
                 </span>
             Restrictions on Camera
-            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-ok"></i></span>
-            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+            <span id="camera-configured" class="has-configured status-icon hidden"><i class="fw fw-success"></i></span>
+            <span id="camera-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span class="camera-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
         <a href="javascript:void(0)" onclick="showAdvanceOperation('encrypt-storage', this)">
@@ -24,8 +24,8 @@
                 </span>
             Encryption Settings
             <span id="encrypt-storage-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="encrypt-storage-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="encrypt-storage-error" class="encryption-error status-icon hidden"><i
                     class="fw fw-error"></i></span>
         </a>
@@ -36,8 +36,8 @@
                 </span>
             Applications Restrictions
             <span id="app-restriction-configured" class="has-configured status-icon hidden"><i
-                    class="fw fw-ok"></i></span>
-            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-ok"></i></span>
+                    class="fw fw-success"></i></span>
+            <span id="app-restriction-ok" class="has-success status-icon hidden"><i class="fw fw-success"></i></span>
             <span id="app-restriction-error" class="has-error status-icon hidden"><i class="fw fw-error"></i></span>
         </a>
     </div>