diff --git a/dashboard-ui/bower_components/paper-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json
index 26486f6c6..321be7143 100644
--- a/dashboard-ui/bower_components/paper-behaviors/.bower.json
+++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json
@@ -42,7 +42,7 @@
     "tag": "v1.0.3",
     "commit": "90b54de14264c19693601b9fc16af6b68a9d48e4"
   },
-  "_source": "git://github.com/PolymerElements/paper-behaviors.git",
+  "_source": "git://github.com/polymerelements/paper-behaviors.git",
   "_target": "^1.0.0",
-  "_originalSource": "PolymerElements/paper-behaviors"
+  "_originalSource": "polymerelements/paper-behaviors"
 }
\ No newline at end of file
diff --git a/dashboard-ui/forgotpassword.html b/dashboard-ui/forgotpassword.html
index 1ce4bc46f..b1f6c66e9 100644
--- a/dashboard-ui/forgotpassword.html
+++ b/dashboard-ui/forgotpassword.html
@@ -14,24 +14,19 @@
                     <h1>${HeaderForgotPassword}</h1>
 
                     <div>
-                        <label for="txtName" style="text-align: left;">${LabelUser}</label>
-                        <input type="text" id="txtName" />
+                        <paper-input type="text" id="txtName" label="${LabelUser}" autocomplete="off"></paper-input>
                         <div class="fieldDescription">${LabelForgotPasswordUsernameHelp}</div>
                     </div>
 
                     <br />
 
-                    <p>
-                        <button type="submit" data-icon="check">
-                            ${ButtonSubmit}
+                    <div>
+                        <button type="submit" data-role="none" class="clearButton">
+                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSubmit}</span></paper-button>
                         </button>
-                    </p>
 
-                    <p>
-                        <a data-role="button" data-icon="delete" href="login.html">
-                            ${ButtonCancel}
-                        </a>
-                    </p>
+                        <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                    </div>
                 </div>
             </form>
 
diff --git a/dashboard-ui/forgotpasswordpin.html b/dashboard-ui/forgotpasswordpin.html
index c4ce4017d..53e078a7b 100644
--- a/dashboard-ui/forgotpasswordpin.html
+++ b/dashboard-ui/forgotpasswordpin.html
@@ -12,23 +12,20 @@
 
                 <div style="text-align: left;">
                     <h2>${HeaderPasswordReset}</h2>
-
-                    <label for="txtPin" style="text-align: left;">${LabelPasswordRecoveryPinCode}</label>
-                    <input type="text" id="txtPin" required="required" />
+                    
+                    <div>
+                        <paper-input type="text" id="txtPin" label="${LabelPasswordRecoveryPinCode}" autocomplete="off" required="required"></paper-input>
+                    </div>
 
                     <br />
 
-                    <p>
-                        <button type="submit" data-icon="check">
-                            ${ButtonSubmit}
+                    <div>
+                        <button type="submit" data-role="none" class="clearButton">
+                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSubmit}</span></paper-button>
                         </button>
-                    </p>
 
-                    <p>
-                        <a data-role="button" data-icon="delete" href="login.html">
-                            ${ButtonCancel}
-                        </a>
-                    </p>
+                        <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                    </div>
                 </div>
             </form>
 
diff --git a/dashboard-ui/scripts/forgotpasswordpin.js b/dashboard-ui/scripts/forgotpasswordpin.js
index 5914be6f3..81790b8d4 100644
--- a/dashboard-ui/scripts/forgotpasswordpin.js
+++ b/dashboard-ui/scripts/forgotpasswordpin.js
@@ -51,8 +51,11 @@
         return false;
     }
 
-    $(document).on('pageinit', '#forgotPasswordPinPage', function () {
-        $('.forgotPasswordPinForm').off('submit', onSubmit).on('submit', onSubmit);
+    $(document).on('pageinit', '.forgotPasswordPinPage', function () {
+
+        var page = this;
+
+        $('form', page).off('submit', onSubmit).on('submit', onSubmit);
     });
 
 })(window);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 4bd35a576..bb096a160 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -1776,10 +1776,10 @@
             renderCriticReviews(page, currentItem);
         });
 
-        var btnMore = page.querySelectorAll('.btnMoreCommands iron-icon');
-        for (var i = 0, length = btnMore.length; i < length; i++) {
-            btnMore[i].icon = AppInfo.moreIcon;
-        }
+        //var btnMore = page.querySelectorAll('.btnMoreCommands iron-icon');
+        //for (var i = 0, length = btnMore.length; i < length; i++) {
+        //    btnMore[i].icon = AppInfo.moreIcon;
+        //}
 
     }).on('pagebeforeshow', "#itemDetailPage", function () {