diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs
index 54546481ba9..801c065221e 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificates/certificates.hbs
@@ -15,7 +15,6 @@
   specific language governing permissions and limitations
   under the License.
 }}
-
 {{unit "cdmf.unit.ui.title" pageTitle="Add Certificate"}}
 
 {{#zone "breadcrumbs"}}
@@ -25,9 +24,8 @@
         </a>
     </li>
     <li>
-        <!--suppress HtmlUnknownTarget -->
         <a href="{{@app.context}}/certificates">
-            Certificates
+           Certificate
         </a>
     </li>
 {{/zone}}
@@ -35,7 +33,6 @@
 {{#zone "navbarActions"}}
     {{#if removePermitted}}
         <li>
-            <!--suppress HtmlUnknownTarget -->
             <a href="{{@app.context}}/certificates/add">
             <span class="fw-stack">
                <i class="fw fw-ring fw-stack-2x"></i>
@@ -100,7 +97,10 @@
             </tr>
 
             </thead>
-            <tbody id="ast-container"></tbody>
+            <tbody id="ast-container">
+
+            <br class="c-both"/>
+            </tbody>
         </table>
     </div>
     <br class="c-both"/>
@@ -121,7 +121,7 @@
                         <a href="#" id="remove-certificate-yes-link" class="btn-operations">
                             Remove
                         </a>
-                        <a href="#" id="remove-certificate-cancel-link" class="btn-operations">
+                        <a href="#" id="remove-certificate-cancel-link" class="btn-operations btn-default">
                             Cancel
                         </a>
                     </div>
@@ -180,9 +180,9 @@
 {{/zone}}
 
 {{#zone "bottomJs"}}
-    <!--suppress HtmlUnknownTarget -->
     <script id="certificate-listing" data-current-user="{{@user.username}}"
             src="{{@page.publicUri}}/templates/certificate-listing.hbs"
             type="text/x-handlebars-template"></script>
+
     {{js "/js/certificate-listing.js"}}
 {{/zone}}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
index 4b1975f9bfd..fafc0533746 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.devices/devices.hbs
@@ -199,7 +199,7 @@
                                         &nbsp;&nbsp;&nbsp;&nbsp;Assign&nbsp;&nbsp;&nbsp;&nbsp;
                                     </a>
                                     &nbsp;&nbsp;
-                                    <a href="#" id="group-device-cancel-link" class="btn-operations">
+                                    <a href="#" id="group-device-cancel-link" class="btn-operations btn-default">
                                         &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
                                     </a>
                                 </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
index 263f47d4119..ada1501a7bb 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
@@ -109,7 +109,7 @@
                                         &nbsp;&nbsp;&nbsp;&nbsp;Next&nbsp;&nbsp;&nbsp;&nbsp;
                                     </a>
                                     &nbsp;&nbsp;
-                                    <a href="#" id="share-group-w1-cancel-link" class="btn-operations">
+                                    <a href="#" id="share-group-w1-cancel-link" class="btn-operations btn-default">
                                         &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
                                     </a>
                                 </div>
@@ -130,7 +130,7 @@
                                         &nbsp;&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;&nbsp;
                                     </a>
                                     &nbsp;&nbsp;
-                                    <a href="#" id="share-group-w2-cancel-link" class="btn-operations">
+                                    <a href="#" id="share-group-w2-cancel-link" class="btn-operations btn-default">
                                         &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
                                     </a>
                                 </div>
@@ -160,7 +160,7 @@
                                         &nbsp;&nbsp;&nbsp;&nbsp;Yes&nbsp;&nbsp;&nbsp;&nbsp;
                                     </a>
                                     &nbsp;&nbsp;
-                                    <a href="#" id="remove-group-cancel-link" class="btn-operations">
+                                    <a href="#" id="remove-group-cancel-link" class="btn-operations btn-default">
                                         &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
                                     </a>
                                 </div>
@@ -203,7 +203,7 @@
                                         &nbsp;&nbsp;&nbsp;&nbsp;Update&nbsp;&nbsp;&nbsp;&nbsp;
                                     </a>
                                     &nbsp;&nbsp;
-                                    <a href="#" id="edit-group-cancel-link" class="btn-operations">
+                                    <a href="#" id="edit-group-cancel-link" class="btn-operations btn-default">
                                         &nbsp;&nbsp;&nbsp;&nbsp;Cancel&nbsp;&nbsp;&nbsp;&nbsp;
                                     </a>
                                 </div>
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 61ba4007d54..1eb81672aa6 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
@@ -268,7 +268,7 @@
                     Remove
                 </a>
 
-                <a href="#" id="remove-policy-cancel-link" class="btn-operations">
+                <a href="#" id="remove-policy-cancel-link" class="btn-operations btn-default">
                     Cancel
                 </a>
             </div>
@@ -337,7 +337,7 @@
         <div class="modal-footer">
             <div class="buttons">
                 <a href="#" id="publish-policy-yes-link" class="btn-operations">Yes</a>
-                <a href="#" id="publish-policy-cancel-link" class="btn-operations">No</a>
+                <a href="#" id="publish-policy-cancel-link" class="btn-operations btn-default">No</a>
             </div>
         </div>
     </div>
@@ -390,7 +390,7 @@
                     Yes
                 </a>
 
-                <a href="#" id="unpublish-policy-cancel-link" class="btn-operations">
+                <a href="#" id="unpublish-policy-cancel-link" class="btn-operations btn-default">
                     No
                 </a>
             </div>
@@ -479,7 +479,7 @@
                     Yes
                 </a>
 
-                <a href="#" id="change-policy-cancel-link" class="btn-operations">
+                <a href="#" id="change-policy-cancel-link" class="btn-operations btn-default">
                     No
                 </a>
             </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
index ca06c183def..0e0457ed450 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/public/js/role-listing.js
@@ -114,7 +114,7 @@ function loadRoles() {
             class: "remove-padding icon-only content-fill",
             data: null,
             defaultContent: "<div class='thumbnail icon'>" +
-                "<i class='square-element text fw fw-bookmark' style='font-size: 30px;'></i>" +
+                "<i class='square-element text fw fw-bookmark' style='font-size: 74px;'></i>" +
                 "</div>"
         },
         {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs
index b9c4083c4e4..9c57bfd6e53 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.roles/roles.hbs
@@ -101,52 +101,52 @@ under the License.
 
 
     <div id="remove-role-modal-content" class="hide">
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h3>Do you really want to remove this role ?</h3>
-
-                    <div class="buttons">
-                        <a href="#" id="remove-role-yes-link" class="btn-operations">
-                            Remove
-                        </a>
-                        <a href="#" id="remove-role-cancel-link" class="btn-operations">
-                            Cancel
-                        </a>
-                    </div>
-                </div>
+        <div class="modal-header">
+            <h3 class="pull-left modal-title">Do you really want to remove this role ?</h3>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
+        </div>
+        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
+        </div>
+        <div class="modal-footer">
+            <div class="buttons">
+                <a href="#" id="remove-role-yes-link" class="btn-operations">
+                    Remove
+                </a>
+                <a href="#" id="remove-role-cancel-link" class="btn-operations btn-default">
+                    Cancel
+                </a>
             </div>
         </div>
     </div>
 
     <div id="remove-role-success-content" class="hide">
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h3>Done. Role was successfully removed.</h3>
-
-                    <div class="buttons">
-                        <a href="#" id="remove-role-success-link" class="btn-operations">
-                            Ok
-                        </a>
-                    </div>
-                </div>
+        <div class="modal-header">
+            <h3 class="pull-left modal-title">Done. Role was successfully removed.</h3>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
+        </div>
+        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
+        </div>
+        <div class="modal-footer">
+            <div class="buttons">
+                <a href="#" id="remove-role-success-link" class="btn-operations">
+                    Ok
+                </a>
             </div>
         </div>
     </div>
 
     <div id="remove-role-error-content" class="hide">
-        <div class="content">
-            <div class="row">
-                <div class="col-lg-5 col-md-6 col-centered">
-                    <h3>An unexpected error occurred. Please try again later.</h3>
-
-                    <div class="buttons">
-                        <a href="#" id="remove-role-error-link" class="btn-operations">
-                            Ok
-                        </a>
-                    </div>
-                </div>
+        <div class="modal-header">
+            <h3 class="pull-left modal-title">An unexpected error occurred. Please try again later.</h3>
+            <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i class="fw fw-cancel"></i></button>
+        </div>
+        <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
+        </div>
+        <div class="modal-footer">
+            <div class="buttons">
+                <a href="#" id="remove-role-error-link" class="btn-operations">
+                    Ok
+                </a>
             </div>
         </div>
     </div>
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
index 2b6e7170801..acceff1fc83 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/public/js/listing.js
@@ -273,7 +273,7 @@ function loadUsers() {
             class: "remove-padding icon-only content-fill",
             data: null,
             defaultContent: '<div class="thumbnail icon">' +
-                '<i class="square-element text fw fw-user" style="font-size: 30px;"></i>' +
+                '<i class="square-element text fw fw-user" style="font-size: 74px;"></i>' +
                 '</div>'
         },
         {
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs
index 88cdc69918b..4cf5b878a00 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.users/users.hbs
@@ -113,7 +113,7 @@
         <div class="modal-footer">
             <div class="buttons">
                 <a href="#" id="invite-user-yes-link" class="btn-operations">yes</a>
-                <a href="#" id="invite-user-cancel-link" class="btn-operations">No</a>
+                <a href="#" id="invite-user-cancel-link" class="btn-operations btn-default">No</a>
             </div>
         </div>
     </div>
@@ -174,7 +174,7 @@
         <div class="modal-footer">
             <div class="buttons">
                 <a href="#" id="remove-user-yes-link" class="btn-operations">Remove</a>
-                <a href="#" id="remove-user-cancel-link" class="btn-operations">Cancel</a>
+                <a href="#" id="remove-user-cancel-link" class="btn-operations btn-default">Cancel</a>
             </div>
         </div>
     </div>
@@ -297,7 +297,7 @@
                     Save
                 </a>
 
-                <a href="#" id="reset-password-cancel-link" class="btn-operations">
+                <a href="#" id="reset-password-cancel-link" class="btn-operations btn-default">
                     Cancel
                 </a>
             </div>