diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/policies.hbs b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/policies.hbs
index 2caad6f1e..e5d83caef 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/policies.hbs
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/mdm.page.policies/policies.hbs
@@ -33,6 +33,7 @@
         </a>
     </li>
     <li>
+        <!--suppress HtmlUnknownTarget -->
         <a href="{{@app.context}}/policies">
             Policies
         </a>
@@ -41,25 +42,29 @@
 
 {{#zone "navbarActions"}}
     {{#if permissions.ADD_ADMIN_POLICY}}
-        <li>
-            <a href="{{@app.context}}/policy/add" class="cu-btn">
-            <span class="icon fw-stack">
-                <i class="fw fw-add fw-stack-1x"></i>
-                <i class="fw fw-ring fw-stack-2x"></i>
-            </span>
-                Add Policy
-            </a>
-        </li>
+        {{#equal noPolicy false}}
+            <li>
+                <!--suppress HtmlUnknownTarget -->
+                <a href="{{@app.context}}/policy/add" class="cu-btn">
+                    <span class="icon fw-stack">
+                        <i class="fw fw-add fw-stack-1x"></i>
+                        <i class="fw fw-ring fw-stack-2x"></i>
+                    </span>
+                    &nbsp;Add New Policy
+                </a>
+            </li>
+        {{/equal}}
     {{/if}}
     {{#if permissions.CHANGE_POLICY_PRIORITY}}
         {{#equal noPolicy false}}
             <li>
+                <!--suppress HtmlUnknownTarget -->
                 <a href="{{@app.context}}/policy/priority" class="cu-btn">
                     <span class="icon fw-stack">
                         <i class="fw fw-throttling-policy fw-stack-1x"></i>
                         <i class="fw fw-ring fw-stack-2x"></i>
                     </span>
-                    Policy Priority
+                    &nbsp;Policy Priority
                 </a>
             </li>
         {{/equal}}
@@ -70,7 +75,7 @@
                 <i class="fw fw-check fw-stack-1x"></i>
                 <i class="fw fw-ring fw-stack-2x"></i>
             </span>
-            Apply Changes To Devices
+            &nbsp;Apply Changes To Devices
         </a>
     </li>
 {{/zone}}
@@ -82,18 +87,21 @@
     {{#equal noPolicy true}}
         <div id="ast-container" class="ast-container list-view">
             <div class="ctrl-info-panel col-centered text-center wr-login">
-                <h2>You don't have any policy at the moment.</h2>
-                <br/>
+                <h3 class="text-muted">
+                    <i class="fw fw-policy fw-3x"></i>
+                </h3>
+                <h3 class="text-muted">You do not have any device policy at the moment</h3>
                 {{#if permissions.ADD_ADMIN_POLICY}}
-                    <p class="text-center">
-                        <a href="{{@app.context}}/policy/add" class="wr-btn">
-                                        <span class="fw-stack">
-                                            <i class="fw fw-ring fw-stack-2x"></i>
-                                            <i class="fw fw-add fw-stack-1x"></i>
-                                        </span>
-                            Add New Policy
+                    <h3>
+                        <!--suppress HtmlUnknownTarget -->
+                        <a href="{{@app.context}}/policy/add" class="btn-operations btn-default">
+                            <span class="fw-stack">
+                                <i class="fw fw-ring fw-stack-2x"></i>
+                                <i class="fw fw-add fw-stack-1x"></i>
+                            </span>
+                            &nbsp;&nbsp;Add New Policy
                         </a>
-                    </p>
+                    </h3>
                 {{/if}}
             </div>
         </div>
@@ -229,6 +237,7 @@
                         data-display="{{status}}">
                     </td>
                     <td class="text-right content-fill text-left-on-grid-view no-wrap">
+                        <!--suppress HtmlUnknownTarget -->
                         <a href="{{@app.context}}/policy/edit?id={{id}}"
                            data-id="{{id}}"
                            data-click-event="remove-form"