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.type-view/public/css/styles.css 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.type-view/public/css/styles.css
index 1a65500ff3..56dc06903e 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.type-view/public/css/styles.css
+++ 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.type-view/public/css/styles.css
@@ -57,4 +57,7 @@ hr {
 
 .doc-link a {
     color: #006eff;
+}
+.enrollment-qr-container canvas {
+    width: 24%;
 }
\ No newline at end of file
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.type-view/public/images/install_agent.png 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.type-view/public/images/install_agent.png
new file mode 100644
index 0000000000..8e52309655
Binary files /dev/null and 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.type-view/public/images/install_agent.png differ
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.type-view/public/images/registration.png 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.type-view/public/images/registration.png
new file mode 100644
index 0000000000..7187b6d20d
Binary files /dev/null and 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.type-view/public/images/registration.png differ
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.type-view/public/images/set_profile.png 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.type-view/public/images/set_profile.png
new file mode 100644
index 0000000000..23e6002dfd
Binary files /dev/null and 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.type-view/public/images/set_profile.png differ
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.type-view/public/js/type-view.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.type-view/public/js/type-view.js
index e6a79d11b9..ea6f396cb1 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.type-view/public/js/type-view.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.type-view/public/js/type-view.js
@@ -349,6 +349,9 @@ $.fn.collapse_nav_sub = function () {
 
 $(document).ready(function () {
     $.sidebar_toggle();
+
+    generateQRCode(".enrollment-qr-container");
+
     if (typeof $.fn.collapse == 'function') {
         $('.navbar-collapse.tiles').on('shown.bs.collapse', function () {
             $(this).collapse_nav_sub();
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.type-view/type-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.type-view/type-view.hbs
index f63c2440ec..f6af817ef8 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.type-view/type-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.type-view/type-view.hbs
@@ -2,72 +2,100 @@
 {{unit "cdmf.unit.device.type.qr-modal" enrollmentURL=enrollmentURL deviceTypeName="Android"}}
 {{unit "cdmf.unit.device.type.email.invite-modal" deviceTypeView="android"}}
 
-<div class="col-lg-12  margin-top-double">
-    <h1 class="grey ">Android Mobile</h1>
-    <hr>
+<div class="row">
+    <div class="col-lg-12">
+        <h1 class="grey ">Android Mobile Device Enrollment</h1>
+        <hr>
+    </div>
 </div>
-<div class="col-xs-12 col-sm-4 col-md-3 col-lg-3 padding-top">
-    <img src="{{@unit.publicUri}}/images/android-icon.png" class="img-responsive">
+
+<div class="row">
+    <!--<div class="col-xs-12 col-sm-4 col-md-3 col-lg-3 add-padding-top-2x">
+        <img src="{{@unit.publicUri}}/images/android-icon.png" class="img-responsive">
+    </div>-->
+    <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 add-padding-top-2x">
+        <h3 class="text-center">Scan to connect your device</h3>
+        <div class="enrollment-qr-container text-center"></div>
+        <h3 class="text-center add-margin-bottom-2x add-margin-top-2x">or</h3>
+        <div class="text-center"><a href="{{host}}/android-web-agent/public/mdm.page.enrollments.android.download-agent/asset/android-agent.apk"
+                                    class="btn-operations remove-margin download_agent">
+            <i class="fw fw-download fw-inverse fw-lg add-margin-1x"></i> Download APK</a></div>
+
+        <!--<p class="doc-link">Please scan the QR code to download the APK on to your android device or click
+            <a href="{{host}}/android-web-agent/public/mdm.page.enrollments.android.download-agent/asset/android-agent.apk">here</a>
+            to save it to your computer.</p>
+        <p class="doc-link">For further instructions and troubleshooting please visit the following <a href="https://docs.wso2.com/display/IoTS300/Android"
+                                     target="_blank">link</a>.</p>-->
+        <p class="doc-link text-center">For further instructions & troubleshooting go <a href="https://docs.wso2.com/display/IoTS300/Android" target="_blank">here</a></p>
+    </div>
 </div>
 
-<div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 padding-top">
+<div class="row">
+    <div class="col-xs-12 col-sm-12 col-md-8 col-lg-12 add-padding-top-2x ">
+        <h3 class="uppercase">To enroll your device</h3><hr>
+    </div>
+</div>
 
-    <h3 class="uppercase">What it Does</h3>
-    <hr>
-    <p class="grey margin-top">Connect and manage your Android device with WSO2 IoT Server.</p>
-    <br>
+<div class="row grey-bg">
+    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
+        <h5><strong>Step 1</strong></h5>
+        <p>Install the downloaded application in to the device to proceed.</p>
+        <img src="{{@unit.publicUri}}/images/install_agent.png" class="img-responsive">
+    </div>
+    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
+        <h5><strong>Step 2</strong></h5>
+        <p>Tap Skip to proceed with the default enrollment process.</p>
+        <img src="{{@unit.publicUri}}/images/set_profile.png" class="img-responsive">
+    </div>
+    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
+        <h5><strong>Step 3</strong></h5>
+        <p>Enter the server address based on your environment, in the text box provided.</p>
+        <img src="{{@unit.publicUri}}/images/registration.png" class="img-responsive">
+    </div>
+    <div class="col-xs-12 col-sm-6 col-md-3 col-lg-3 add-padding-top-2x add-padding-bottom-2x">
+        <h5><strong>Step 4</strong></h5>
+        <p>Enter your credentials on to the provided fields and tap Register. </p>
+        <img src="{{@unit.publicUri}}/images/install_agent.png" class="img-responsive">
+    </div>
+</div>
 
-    <a href="javascript:toggleEnrollment()" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg add-margin-1x"></i> Enroll Device</a>
-    <a href="{{host}}/android-web-agent/public/mdm.page.enrollments.android.download-agent/asset/android-agent.apk" class="btn-operations"><i class="fw fw-download fw-inverse fw-lg add-margin-1x"></i> Download APK</a>
-    {{#unless isCloud}}
-    <a href="javascript:toggleEmailInvite()" class="btn-operations"><i class="fw fw-mail fw-inverse fw-lg add-margin-1x"></i> Invite by Email</a>
-    {{/unless}}
-    {{#if displayStatus}}
-        <a href="javascript:artifactUpload()" class="btn-operations"><i class="fw fw-upload fw-inverse fw-lg add-margin-1x"></i> Deploy Analytics Artifacts</a>
-    {{/if}}
+<!--<div class="row">
+    <div class="col-xs-12 col-sm-12 col-md-8 col-lg-12 padding-double ">
+        <h3 class="uppercase">What You Need</h3>
+        <hr>
+        <ul class="list-unstyled">
+            <li class="padding-top-double"><span class="badge">STEP 01</span>   Android
+                Mobile.
+            </li>
+            <li><span class="badge">STEP 02</span>   Go ahead
+                and click [Enroll Device].
+            </li>
+            <li><span class="badge">STEP 03</span>   Proceed
+                to the [Prepare] section.
+            </li>
+        </ul>
+        <br>
+    </div>
+</div>
 
-    <p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS300/Android"
-                                 target="_blank">here</a> for latest instructions and troubleshooting.</p>
+<div class="row">
+    <div class="col-xs-12 col-sm-8 col-md-9 col-lg-9">
 
-    <h3 class="uppercase">What You Need</h3>
-    <hr>
-    <ul class="list-unstyled">
-        <li class="padding-top-double"><span class="badge">STEP 01</span>   Android
-                                                                            Mobile.
-        </li>
-        <li><span class="badge">STEP 02</span>   Go ahead
-                                                 and click [Enroll Device].
-        </li>
-        <li><span class="badge">STEP 03</span>   Proceed
-                                                 to the [Prepare] section.
-        </li>
-    </ul>
-    <br>
+        <h3 class="uppercase">What it Does</h3>
+        <hr>
+        <p class="grey margin-top">Connect and manage your Android device with WSO2 IoT Server.</p>
+        <br>
 
-</div>
+        <a href="javascript:toggleEnrollment()" class="download-link btn-operations"><i class="fw fw-mobile fw-inverse fw-lg add-margin-1x"></i> Enroll Device</a>
+        <a href="{{host}}/android-web-agent/public/mdm.page.enrollments.android.download-agent/asset/android-agent.apk" class="btn-operations"><i class="fw fw-download fw-inverse fw-lg add-margin-1x"></i> Download APK</a>
+        <a href="javascript:toggleEmailInvite()" class="btn-operations"><i class="fw fw-mail fw-inverse fw-lg add-margin-1x"></i> Invite by Email</a>
+
+
+        <p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS300/Android" target="_blank">here</a> for further instructions and troubleshooting.</p>
 
-<div id="android-statistic-response-template" style="display: none">
-    <div class="content">
-        <div class="row">
-            <div class="col-lg-5 col-md-6 col-centered">
-                <h3>
-                    <span class="fw-stack">
-                        <i class="fw fw-circle-outline fw-stack-2x"></i>
-                        <i id="status-icon" class="fw fw-error fw-stack-1x"></i>
-                    </span>
-                    <br>
-                </h3>
-                <h4>
-                    <span id="title"></span>
-                    <br>
-                </h4>
-                <span id="description"></span>
-            </div>
-        </div>
     </div>
 </div>
 
-
 <div class="col-xs-12 col-sm-12 col-md-8 col-lg-12 padding-double grey-bg">
     <h3 class="uppercase">Prepare</h3><hr>
     <ul class="list-unstyled">
@@ -77,16 +105,16 @@
     </ul>
     <br>
 
-</div>
+</div>-->
 
-<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 padding-double">
+<!--<div class="col-xs-12 col-sm-6 col-md-6 col-lg-6 padding-double">
     <p class="grey margin-top">Click on the image to zoom</p>
     <center>
         <a href="{{@unit.publicUri}}/images/android_device.png" target="_blank">
             <img src="{{@unit.publicUri}}/images/android_device.png" class="img-responsive">
         </a>
     </center>
-</div>
+</div>-->
 
 <br/>
 
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.operation-bar/public/templates/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.operation-bar/public/templates/operations.hbs
index 8e1c19dc41..2a96b1503e 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.operation-bar/public/templates/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.operation-bar/public/templates/operations.hbs
@@ -1,7 +1,7 @@
 <div id="errorOperations" class="operation">
     <div class="modal-header">
         <h3 class="pull-left modal-title">
-            <span class="fw-stack">
+            <span class="fw-stack add-margin-right-2x">
                 <i class="fw fw-circle-outline fw-stack-2x"></i>
                 <i class="fw fw-error fw-stack-1x"></i>
             </span>
@@ -23,7 +23,7 @@
 <div id="errorOperationUnexpected" class="operation">
     <div class="modal-header">
         <h3 class="pull-left modal-title">
-            <span class="fw-stack">
+            <span class="fw-stack add-margin-right-2x">
                 <i class="fw fw-circle-outline fw-stack-2x"></i>
                 <i class="fw fw-error fw-stack-1x"></i>
             </span>
@@ -45,7 +45,7 @@
 <div id="operationSuccess" class="operation">
     <div class="modal-header">
         <h3 class="pull-left modal-title">
-            <span class="fw-stack">
+            <span class="fw-stack add-margin-right-2x">
                 <i class="fw fw-circle-outline fw-stack-2x"></i>
                 <i class="fw fw-check fw-stack-1x"></i>
             </span>
@@ -68,7 +68,7 @@
 <div id="messageSuccess" class="operation">
     <div class="modal-header">
         <h3 class="pull-left modal-title">
-            <span class="fw-stack">
+            <span class="fw-stack add-margin-right-2x">
                         <i class="fw fw-circle-outline fw-stack-2x"></i>
                         <i class="fw fw-check fw-stack-1x"></i>
                     </span>
@@ -95,7 +95,7 @@
         <div class="modal-content clearfix">
             <div class="modal-header">
                 <h3 class="pull-left modal-title">
-                    <span class="fw-stack">
+                    <span class="fw-stack add-margin-right-2x">
                         <i class="fw fw-circle-outline fw-stack-2x"></i>
                         <i class="fw {{icon}} fw-stack-1x"></i>
                     </span>