diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.search/public/templates/device-listing.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.search/public/templates/device-listing.hbs
index 4fd4390096..c0fe171866 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.search/public/templates/device-listing.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.device.search/public/templates/device-listing.hbs
@@ -20,7 +20,7 @@
                 </td>
                 <td class="remove-padding-top" data-search="{{enrolmentInfo.owner}}" data-display="{{enrolmentInfo.owner}}" data-grid-label="Owner">{{enrolmentInfo.owner}}</td>
                 <td class="remove-padding-top" data-search="{{enrolmentInfo.status}}" data-display="{{enrolmentInfo.status}}" data-grid-label="Status">
-                    {{#equal enrolmentInfo.status "ACTIVE"}}<span><i class="fw fw-ok icon-success"></i> Active</span>{{/equal}}
+                    {{#equal enrolmentInfo.status "ACTIVE"}}<span><i class="fw fw-success icon-success"></i> Active</span>{{/equal}}
                     {{#equal enrolmentInfo.status "INACTIVE"}}<span><i class="fw fw-warning icon-warning"></i> Inactive</span>{{/equal}}
                     {{#equal enrolmentInfo.status "BLOCKED"}}<span><i class="fw fw-remove icon-danger"></i> Blocked</span>{{/equal}}
                     {{#equal enrolmentInfo.status "REMOVED"}}<span><i class="fw fw-delete icon-danger"></i> Removed</span>{{/equal}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
index b3c977f9d1..bae88512d5 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/public/js/listing.js
@@ -277,7 +277,7 @@ function loadDevices(searchType, searchParam) {
                 var html;
                 switch (status) {
                     case 'ACTIVE' :
-                        html = '<span><i class="fw fw-ok icon-success"></i> Active</span>';
+                        html = '<span><i class="fw fw-success icon-success"></i> Active</span>';
                         break;
                     case 'INACTIVE' :
                         html = '<span><i class="fw fw-warning icon-warning"></i> Inactive</span>';
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs
index 87c8b9ca7e..ad28493c61 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.policies/policies.hbs
@@ -196,7 +196,7 @@
                             <span><i class="fw fw-warning icon-success"></i> Active/Updated</span>
                         {{/equal}}
                         {{#equal status "Active"}}
-                            <span><i class="fw fw-ok icon-success"></i> Active</span>
+                            <span><i class="fw fw-success icon-success"></i> Active</span>
                         {{/equal}}
                         {{#equal status "Inactive/Updated"}}
                             <span><i class="fw fw-warning icon-warning"></i> Inactive/Updated</span>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/public/js/validate-register.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/public/js/validate-register.js
index ea67fcc832..82b0068f7c 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/public/js/validate-register.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.register/public/js/validate-register.js
@@ -121,12 +121,12 @@ $(document).ready(function(){
                            $("#add-user-btn").prop('disabled', false);
                            if (data == 200) {
                                $('.wr-validation-summary strong').html(
-                                       "<i class=\"icon fw fw-ok\"></i> Successfully Submitted.");
+                                       "<i class=\"icon fw fw-success\"></i> Successfully Submitted.");
                                $('.wr-validation-summary').removeClass("alert-danger");
                                $('.wr-validation-summary').addClass("alert-success");
                            } else if (data == 201) {
                                $('.wr-validation-summary strong').html(
-                                       "<i class=\"icon fw fw-ok\"></i> User created succssfully. You will be " +
+                                       "<i class=\"icon fw fw-success\"></i> User created succssfully. You will be " +
                                        "redirected to login page.");
                                $('.wr-validation-summary').removeClass("alert-danger");
                                $('.wr-validation-summary').addClass("alert-success");
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.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.device.overview-section/overview-section.hbs
index 34d64824e9..8cf8c0cfd7 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.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.device.overview-section/overview-section.hbs
@@ -51,7 +51,7 @@
         <td class="sorting_1" style="padding:10px 15px;">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 class="fw fw-remove icon-danger"></i> Blocked</span>{{/equal}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/js/device-view.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/js/device-view.js
index 3672656fd4..b0fb423aa2 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/js/device-view.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/js/device-view.js
@@ -81,7 +81,7 @@
                         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>";
@@ -90,10 +90,10 @@
                                 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/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/templates/policy-compliance.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/templates/policy-compliance.hbs
index 590662aa20..c4872949cd 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/templates/policy-compliance.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/templates/policy-compliance.hbs
@@ -26,7 +26,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>
@@ -62,7 +62,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/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/templates/policy-list.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/templates/policy-list.hbs
index 25a119461d..e90198678b 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/templates/policy-list.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.view/public/templates/policy-list.hbs
@@ -15,7 +15,7 @@
                     <i class="fw fw-warning icon-success"></i> Active/Updated</span>
                 {{/equal}}
                 {{#equal status "Active"}}
-                    <i class="fw fw-ok icon-success"></i> Active</span>
+                    <i class="fw fw-success icon-success"></i> Active</span>
                 {{/equal}}
                 {{#equal status "Inactive/Updated"}}
                     <i class="fw fw-warning icon-warning"></i> Inactive/Updated</span>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.effective-policy.view/public/js/view.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.effective-policy.view/public/js/view.js
index a41d89fa1b..27a1960b8f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.effective-policy.view/public/js/view.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.effective-policy.view/public/js/view.js
@@ -30,7 +30,7 @@ var displayPolicy = function (policyPayloadObj) {
     if (policyPayloadObj["active"] == true && policyPayloadObj["updated"] == true) {
         policyStatus = '<i class="fw fw-warning icon-success"></i> Active/Updated</span>';
     } else if (policyPayloadObj["active"] == true && policyPayloadObj["updated"] == false) {
-        policyStatus = '<i class="fw fw-ok icon-success"></i> Active</span>';
+        policyStatus = '<i class="fw fw-success icon-success"></i> Active</span>';
     } else if (policyPayloadObj["active"] == false && policyPayloadObj["updated"] == true) {
         policyStatus = '<i class="fw fw-warning icon-warning"></i> Inactive/Updated</span>';
     } else if (policyPayloadObj["active"] == false && policyPayloadObj["updated"] == false) {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/public/js/view.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/public/js/view.js
index c308acb65a..8ff991b1ef 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/public/js/view.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.policy.view/public/js/view.js
@@ -32,7 +32,7 @@ var displayPolicy = function (policyPayloadObj) {
     if (policyPayloadObj["active"] == true && policyPayloadObj["updated"] == true) {
         policyStatus = '<i class="fw fw-warning icon-success"></i> Active/Updated</span>';
     } else if (policyPayloadObj["active"] == true && policyPayloadObj["updated"] == false) {
-        policyStatus = '<i class="fw fw-ok icon-success"></i> Active</span>';
+        policyStatus = '<i class="fw fw-success icon-success"></i> Active</span>';
     } else if (policyPayloadObj["active"] == false && policyPayloadObj["updated"] == true) {
         policyStatus = '<i class="fw fw-warning icon-warning"></i> Inactive/Updated</span>';
     } else if (policyPayloadObj["active"] == false && policyPayloadObj["updated"] == false) {