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.edit/public/templates/hidden-operations-android-edit.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.edit/public/templates/hidden-operations-android-edit.hbs
index bd58dee1d..37b59a8ae 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.edit/public/templates/hidden-operations-android-edit.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.edit/public/templates/hidden-operations-android-edit.hbs
@@ -1510,7 +1510,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#cosu-whitelisted-applications-grid" class="grid-input-add"
+                            <a href="#cosu-whitelisted-applications-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
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.edit/public/templates/hidden-operations-ios-edit.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.edit/public/templates/hidden-operations-ios-edit.hbs
index 28c5bb9be..0f0d54d8a 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.edit/public/templates/hidden-operations-ios-edit.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.edit/public/templates/hidden-operations-ios-edit.hbs
@@ -461,7 +461,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                 <br>
-                                <a href="#on-demand-match-domains-grid" class="grid-input-add"
+                                <a href="#on-demand-match-domains-grid" class="btn btn-secondary grid-input-add"
                                    data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
@@ -531,7 +531,7 @@
                                     <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                                 </span>
                                 <br>
-                                <a href="#on-demand-match-domains-never-grid" class="grid-input-add"
+                                <a href="#on-demand-match-domains-never-grid" class="btn btn-secondary grid-input-add"
                                    data-click-event="add-form">
                                     <span class="icon fw-stack">
                                         <i class="fw fw-add fw-stack-1x"></i>
@@ -601,7 +601,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                 <br>
-                                <a href="#on-demand-match-domains-retry-grid" class="grid-input-add"
+                                <a href="#on-demand-match-domains-retry-grid" class="btn btn-secondary grid-input-add"
                                    data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
@@ -673,7 +673,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#vpn-vendor-configs-grid" class="grid-input-add" data-click-event="add-form">
+                            <a href="#vpn-vendor-configs-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
@@ -1240,7 +1240,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#safari-domains-grid" class="grid-input-add" data-click-event="add-form">
+                            <a href="#safari-domains-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
@@ -1337,7 +1337,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#app-vpn-mappings-grid" class="grid-input-add" data-click-event="add-form">
+                            <a href="#app-vpn-mappings-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
@@ -1798,7 +1798,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                     <br>
-                                    <a href="#wifi-payload-certificate-anchor-uuids-grid" class="grid-input-add"
+                                    <a href="#wifi-payload-certificate-anchor-uuids-grid" class="btn btn-secondary grid-input-add"
                                        data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
@@ -1874,7 +1874,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                                     <br>
-                                    <a href="#wifi-tls-trusted-server-names-grid" class="grid-input-add"
+                                    <a href="#wifi-tls-trusted-server-names-grid" class="btn btn-secondary grid-input-add"
                                        data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
@@ -2109,7 +2109,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#wifi-roaming-consortium-ois-grid" class="grid-input-add"
+                            <a href="#wifi-roaming-consortium-ois-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
@@ -2180,7 +2180,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#wifi-nai-realm-names-grid" class="grid-input-add" data-click-event="add-form">
+                            <a href="#wifi-nai-realm-names-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
@@ -2249,7 +2249,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#wifi-mcc-and-mncs-grid" class="grid-input-add" data-click-event="add-form">
+                            <a href="#wifi-mcc-and-mncs-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
@@ -2358,7 +2358,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#restricted-applications-grid" class="grid-input-add"
+                            <a href="#restricted-applications-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
@@ -2848,7 +2848,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#airplay-credentials-grid" class="grid-input-add"
+                            <a href="#airplay-credentials-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
@@ -2925,7 +2925,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#airplay-destinations-grid" class="grid-input-add"
+                            <a href="#airplay-destinations-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
@@ -3024,7 +3024,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#unmarked-email-domains-grid" class="grid-input-add"
+                            <a href="#unmarked-email-domains-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
@@ -3088,7 +3088,7 @@
                         <label class="wr-input-label" for="safari-web-domains">
                             Managed Safari Web Domains
                             <br>
-                            <a href="#safari-web-domains-grid" class="grid-input-add"
+                            <a href="#safari-web-domains-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
@@ -3253,7 +3253,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#ldap-search-settings-grid" class="grid-input-add"
+                            <a href="#ldap-search-settings-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
@@ -3599,7 +3599,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#apn-configurations-grid" class="grid-input-add"
+                            <a href="#apn-configurations-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
@@ -3776,7 +3776,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#cellular-apn-configurations-grid" class="grid-input-add"
+                            <a href="#cellular-apn-configurations-grid" class="btn btn-secondary grid-input-add"
                                data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
@@ -4969,7 +4969,7 @@
                                         </span>
                                         <br>
                                         <a href="#restrictions-autonomous-single-app-mode-permitted-app-ids-grid"
-                                           class="grid-input-add" data-click-event="add-form">
+                                           class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                             <span class="icon fw-stack">
                                                 <i class="fw fw-add fw-stack-1x"></i>
                                                 <i class="fw fw-ring fw-stack-2x"></i>
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.edit/public/templates/hidden-operations-windows-edit.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.edit/public/templates/hidden-operations-windows-edit.hbs
index 3e6daf930..2d31ab95c 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.edit/public/templates/hidden-operations-windows-edit.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.edit/public/templates/hidden-operations-windows-edit.hbs
@@ -365,7 +365,7 @@
                                 <span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
                             </span>
                             <br>
-                            <a href="#restricted-applications-grid" class="grid-input-add" data-click-event="add-form">
+                            <a href="#restricted-applications-grid" class="btn btn-secondary grid-input-add" data-click-event="add-form">
                                 <span class="icon fw-stack">
                                     <i class="fw fw-add fw-stack-1x"></i>
                                     <i class="fw fw-ring fw-stack-2x"></i>
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk
index bfb52e737..6a20d5ec2 100644
Binary files a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk and b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.android.download-agent/public/asset/android-agent.apk differ