diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html
index a831e88b3c..5ed6f4a31f 100644
--- a/dashboard-ui/addplugin.html
+++ b/dashboard-ui/addplugin.html
@@ -63,11 +63,9 @@
                                         <input type="hidden" id="featureId" name="item_number" value="">
                                         <input type="hidden" name="notify_url" value="https://mb3admin.com/admin/service/services/ppipn.php">
                                         <input type="hidden" name="return" id="paypalReturnUrl" value="#">
-                                        <button type="submit" id="ppButton" class="clearButton">
-                                            <paper-button raised class="block" style="background-color: #179BD7;color:#fff;">
-                                                <iron-icon icon="check"></iron-icon>
-                                                <span>${RegisterWithPayPal}</span>
-                                            </paper-button>
+                                        <button is="emby-button" type="submit" id="ppButton" class="raised block" style="background-color: #179BD7;color:#fff;">
+                                            <iron-icon icon="check"></iron-icon>
+                                            <span>${RegisterWithPayPal}</span>
                                         </button>
 
                                     </div>
diff --git a/dashboard-ui/autoorganizelog.html b/dashboard-ui/autoorganizelog.html
index de7daab368..4e6a7a4eb6 100644
--- a/dashboard-ui/autoorganizelog.html
+++ b/dashboard-ui/autoorganizelog.html
@@ -7,8 +7,8 @@
                 </div>
 
                 <div style="float: right; position: relative; top: 15px;margin-top: -5px;display:none;" class="organizeTaskPanel">
-                    <paper-button type="button" class="btnClearLog" raised style="display: inline-block;"><iron-icon icon="clear-all"></iron-icon><span>${ButtonClear}</span></paper-button>
-                    <paper-button type="button" class="btnOrganize" raised><iron-icon icon="check"></iron-icon><span>${ButtonOrganize}</span></paper-button>
+                    <button is="emby-button" type="button" type="button" class="btnClearLog" raised style="display: inline-block;"><iron-icon icon="clear-all"></iron-icon><span>${ButtonClear}</span></button>
+                    <button is="emby-button" type="button" type="button" class="btnOrganize" raised><iron-icon icon="check"></iron-icon><span>${ButtonOrganize}</span></button>
                     <progress max="100" min="0" style="width:100px;display:none;" class="organizeProgress"></progress>
                 </div>
                 <br />
diff --git a/dashboard-ui/autoorganizetv.html b/dashboard-ui/autoorganizetv.html
index 1e933cddf8..121c006686 100644
--- a/dashboard-ui/autoorganizetv.html
+++ b/dashboard-ui/autoorganizetv.html
@@ -151,9 +151,7 @@
 
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                     </li>
 
                 </ul>
diff --git a/dashboard-ui/bower_components/emby-collapsible/emby-collapsible.html b/dashboard-ui/bower_components/emby-collapsible/emby-collapsible.html
index bee2b5380f..270c398409 100644
--- a/dashboard-ui/bower_components/emby-collapsible/emby-collapsible.html
+++ b/dashboard-ui/bower_components/emby-collapsible/emby-collapsible.html
@@ -1,6 +1,5 @@
 <link rel="import" href="../polymer/polymer.html">
 <link rel="import" href="../iron-icon/iron-icon.html">
-<link rel="import" href="../paper-button/paper-button.html">
 <link rel="import" href="../neon-animation/neon-animation-runner-behavior.html">
 <link rel="import" href="../neon-animation/animations/transform-animation.html">
 <link rel="import" href="../iron-collapse/iron-collapse.html">
@@ -37,11 +36,11 @@
             }
         </style>
         <div>
-            <paper-button on-tap="toggleExpand" id="expandButton" class="emby-collapsible-button">
+            <button is="emby-button" type="button" on-click="toggleExpand" id="expandButton" class="emby-collapsible-button block">
                 <iron-icon id="titleIcon" icon="[[icon]]" style="[[iconstyle]]"></iron-icon>
                 <h3 class="emby-collapsible-title" title="[[title]]">[[title]]</h3>
                 <iron-icon id="expandIcon" style="margin-left: auto; margin-right: .5em;"></iron-icon>
-            </paper-button>
+            </button>
             <iron-collapse id="contentCollapse" class="emby-collapsible-content" opened="{{expanded}}">
                 <content></content>
             </iron-collapse>
diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index c8254517e9..58e838313c 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@@ -15,12 +15,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.4.24",
-  "_release": "1.4.24",
+  "version": "1.4.25",
+  "_release": "1.4.25",
   "_resolution": {
     "type": "version",
-    "tag": "1.4.24",
-    "commit": "05159909e71faf74eb1d39f3cac661614b0a5d5b"
+    "tag": "1.4.25",
+    "commit": "aa53e6de589581ac2cd9773b464c59a79ab45486"
   },
   "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "^1.2.0",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css
index 86a33c1c6b..04f4bc7394 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css
@@ -31,7 +31,7 @@
         top: 50%;
         left: 50%;
         max-width: 70%;
-        max-height: 80%;
+        max-height: 84%;
     }
 
 @media all and (min-width: 1280px) and (min-height: 720px) {
diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
index 59b8ff36ed..bff74004f9 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
@@ -6,7 +6,8 @@
     margin: 0 .29em;
     background: transparent;
     text-align: center;
-    font: inherit;
+    font-size: inherit;
+    font-family: inherit;
     color: inherit;
     outline-width: 0;
     -moz-user-select: none;
@@ -25,6 +26,8 @@
     outline: none !important;
     position: relative;
     overflow: hidden;
+    font-weight: 500;
+    text-transform: uppercase;
 }
 
     [is="emby-button"].raised {
@@ -35,7 +38,7 @@
         display: flex;
         align-items: center;
         justify-content: center;
-        margin: .25em .29em;
+        margin: .25em 0;
         width: 100%;
     }
 
@@ -55,19 +58,21 @@
     height: 50px;
     top: 50%;
     left: 50%;
-    background: white;
-    animation: ripple-animation 2s;
-    opacity: 0.4;
+    background: currentcolor;
+    animation: ripple-animation .8s;
+    opacity: 0.25;
+    -webkit-transform: translate(0, 0);
+    transform: translate3d(0, 0, 0);
 }
 
 @keyframes ripple-animation {
     from {
         transform: none;
-        opacity: 0.4;
+        opacity: 0.5;
     }
 
     to {
-        transform: scale(100);
+        transform: scale(20);
         opacity: 0;
     }
 }
diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.js b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.js
index 7db2ee3817..41be6c3d79 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.js
@@ -18,9 +18,9 @@
 
         this.appendChild(div);
 
-        setTimeout(function () {
+        div.addEventListener("animationend", function() {
             div.parentNode.removeChild(div);
-        }, 2000);
+        }, false);
     }
 
     function onKeyDown(e) {
@@ -30,6 +30,13 @@
         }
     }
 
+    function onMouseDown(e) {
+
+        if (e.button == 0) {
+            animateButton.call(this, e);
+        }
+    }
+
     EmbyButtonPrototype.attachedCallback = function () {
 
         if (this.getAttribute('data-embybutton') == 'true') {
@@ -39,7 +46,8 @@
         this.setAttribute('data-embybutton', 'true');
 
         this.addEventListener('keydown', onKeyDown);
-        this.addEventListener('mousedown', animateButton);
+        this.addEventListener('mousedown', onMouseDown);
+        this.addEventListener('touchstart', animateButton);
         //this.addEventListener('click', animateButton);
     };
 
diff --git a/dashboard-ui/bower_components/emby-webcomponents/focusmanager.js b/dashboard-ui/bower_components/emby-webcomponents/focusmanager.js
index 8b78d2185d..a2b2513f68 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/focusmanager.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/focusmanager.js
@@ -20,11 +20,6 @@ define([], function () {
 
     function focus(element) {
 
-        var tagName = element.tagName;
-        if (tagName == 'PAPER-INPUT') {
-            element = element.querySelector('input') || element;
-        }
-
         try {
             element.focus();
         } catch (err) {
@@ -32,7 +27,7 @@ define([], function () {
         }
     }
 
-    var focusableTagNames = ['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON', 'A', 'PAPER-BUTTON', 'PAPER-INPUT', 'PAPER-CHECKBOX'];
+    var focusableTagNames = ['INPUT', 'TEXTAREA', 'SELECT', 'BUTTON', 'A', 'PAPER-CHECKBOX'];
     var focusableContainerTagNames = ['BODY', 'DIALOG'];
     var focusableQuery = focusableTagNames.join(',') + ',.focusable';
 
diff --git a/dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js b/dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js
index f40c82f1be..df22363c3e 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/images/imagehelper.js
@@ -109,29 +109,25 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events', 'browser
         target.addEventListener(type, handler, optionsOrCapture);
     }
 
-    function unveilWithIntersection(images) {
+    function unveilWithIntersection(images, root) {
 
         var filledCount = 0;
 
         var options = {};
 
-        options.rootMargin = "150%";
+        //options.rootMargin = "300%";
 
         var observer = new IntersectionObserver(function (entries) {
             for (var j = 0, length2 = entries.length; j < length2; j++) {
                 var entry = entries[j];
-                var intersectionRatio = entry.intersectionRatio;
-                if (intersectionRatio) {
-
-                    var target = entry.target;
-                    observer.unobserve(target);
-                    fillImage(target);
-                    filledCount++;
-                }
+                var target = entry.target;
+                observer.unobserve(target);
+                fillImage(target);
+                filledCount++;
             }
 
             if (filledCount >= images.length) {
-                //observer.disconnect();
+                observer.disconnect();
             }
         },
         options
@@ -142,14 +138,14 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events', 'browser
         }
     }
 
-    function unveilElements(images) {
+    function unveilElements(images, root) {
 
         if (!images.length) {
             return;
         }
 
         if (supportsIntersectionObserver) {
-            unveilWithIntersection(images);
+            unveilWithIntersection(images, root);
             return;
         }
 
@@ -223,7 +219,7 @@ define(['visibleinviewport', 'imageFetcher', 'layoutManager', 'events', 'browser
 
     function lazyChildren(elem) {
 
-        unveilElements(elem.getElementsByClassName('lazy'));
+        unveilElements(elem.getElementsByClassName('lazy'), elem);
     }
 
     function getPrimaryImageAspectRatio(items) {
diff --git a/dashboard-ui/bower_components/iron-meta/.bower.json b/dashboard-ui/bower_components/iron-meta/.bower.json
index e1304d174b..f4bfef4a7c 100644
--- a/dashboard-ui/bower_components/iron-meta/.bower.json
+++ b/dashboard-ui/bower_components/iron-meta/.bower.json
@@ -26,14 +26,14 @@
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
   "main": "iron-meta.html",
-  "homepage": "https://github.com/PolymerElements/iron-meta",
+  "homepage": "https://github.com/polymerelements/iron-meta",
   "_release": "1.1.1",
   "_resolution": {
     "type": "version",
     "tag": "v1.1.1",
     "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f"
   },
-  "_source": "git://github.com/PolymerElements/iron-meta.git",
+  "_source": "git://github.com/polymerelements/iron-meta.git",
   "_target": "^1.0.0",
-  "_originalSource": "PolymerElements/iron-meta"
+  "_originalSource": "polymerelements/iron-meta"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/iron-resizable-behavior/.bower.json b/dashboard-ui/bower_components/iron-resizable-behavior/.bower.json
index cca11d8994..2e765b9324 100644
--- a/dashboard-ui/bower_components/iron-resizable-behavior/.bower.json
+++ b/dashboard-ui/bower_components/iron-resizable-behavior/.bower.json
@@ -28,14 +28,14 @@
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
   "ignore": [],
-  "homepage": "https://github.com/polymerelements/iron-resizable-behavior",
+  "homepage": "https://github.com/PolymerElements/iron-resizable-behavior",
   "_release": "1.0.3",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.3",
     "commit": "dda1df6aaf452aedf3e52ff0cf69e72439452216"
   },
-  "_source": "git://github.com/polymerelements/iron-resizable-behavior.git",
+  "_source": "git://github.com/PolymerElements/iron-resizable-behavior.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-resizable-behavior"
+  "_originalSource": "PolymerElements/iron-resizable-behavior"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/paper-button/.bower.json b/dashboard-ui/bower_components/paper-button/.bower.json
index 2800113b1e..3cad8b9c9e 100644
--- a/dashboard-ui/bower_components/paper-button/.bower.json
+++ b/dashboard-ui/bower_components/paper-button/.bower.json
@@ -1,6 +1,6 @@
 {
   "name": "paper-button",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Material design button",
   "authors": [
     "The Polymer Authors"
@@ -16,34 +16,33 @@
   "private": true,
   "repository": {
     "type": "git",
-    "url": "git://github.com/PolymerElements/paper-button"
+    "url": "git://github.com/PolymerElements/paper-button.git"
   },
   "license": "http://polymer.github.io/LICENSE.txt",
   "homepage": "https://github.com/PolymerElements/paper-button",
   "dependencies": {
     "polymer": "Polymer/polymer#^1.1.0",
-    "paper-ripple": "polymerelements/paper-ripple#^1.0.0",
-    "paper-material": "polymerelements/paper-material#^1.0.0",
-    "paper-behaviors": "polymerelements/paper-behaviors#^1.0.0",
-    "iron-flex-layout": "polymerelements/iron-flex-layout#^1.0.0"
+    "iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0",
+    "paper-behaviors": "PolymerElements/paper-behaviors#^1.0.0",
+    "paper-material": "PolymerElements/paper-material#^1.0.0"
   },
   "devDependencies": {
-    "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
-    "web-component-tester": "polymer/web-component-tester#^3.4.0",
-    "test-fixture": "polymerelements/test-fixture#^1.0.0",
-    "iron-component-page": "polymerelements/iron-component-page#^1.0.0",
+    "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
     "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0",
-    "iron-icon": "polymerelements/iron-icon#^1.0.0",
-    "iron-icons": "polymerelements/iron-icons#^1.0.0",
-    "iron-test-helpers": "polymerelements/iron-test-helpers#^1.0.0",
-    "paper-styles": "polymerelements/paper-styles#^1.0.0"
+    "iron-icon": "PolymerElements/iron-icon#^1.0.0",
+    "iron-icons": "PolymerElements/iron-icons#^1.0.0",
+    "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0",
+    "paper-styles": "PolymerElements/paper-styles#^1.0.0",
+    "test-fixture": "PolymerElements/test-fixture#^1.0.0",
+    "web-component-tester": "^4.0.0",
+    "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
   "ignore": [],
-  "_release": "1.0.11",
+  "_release": "1.0.12",
   "_resolution": {
     "type": "version",
-    "tag": "v1.0.11",
-    "commit": "7d0f75300372d91835ae7298593d50987d4a610f"
+    "tag": "v1.0.12",
+    "commit": "96c3a2661c355223d0b41e1d34126f9c62d544dc"
   },
   "_source": "git://github.com/PolymerElements/paper-button.git",
   "_target": "~1.0.1",
diff --git a/dashboard-ui/bower_components/paper-button/.travis.yml b/dashboard-ui/bower_components/paper-button/.travis.yml
index 77c5526690..070e3e5403 100644
--- a/dashboard-ui/bower_components/paper-button/.travis.yml
+++ b/dashboard-ui/bower_components/paper-button/.travis.yml
@@ -1,15 +1,14 @@
 language: node_js
-sudo: false
+sudo: required
 before_script:
-  - npm install web-component-tester
-  - npm install bower
-  - 'export PATH=$PWD/node_modules/.bin:$PATH'
+  - npm install -g bower polylint web-component-tester
   - bower install
+  - polylint
 env:
   global:
     - secure: geFs7Ipj7/9knSKT2FEYAB7b/zbmgWFXCgZm7cEcrG71EX/HB1do3spANGOlRly77xaZtNNF1OGYBHIP36DSyMEHRYj6TYtTrPIr2ySeHvoOv0nzYakXdscxBvfI5HJrNiFpld80KoGl8vKfroLNpVLallgumX3diydypolvW1I=
     - secure: IILEhg3m49exN5hpxbPP1JA/q+s4v/QpOMbDiXVRV4Uz1XwOPGLCyrAB0ENjwzMCyeOah1Z2MyQSUiPisLheHKvZifhviNqizWN//8EDkg1gkU0R6egGdotD5mBb3UpCD0CNZ8+D0FYwOpdCWCruwr7N+zDUN+6r5H07KP/VeUU=
-node_js: 4
+node_js: stable
 addons:
   firefox: latest
   apt:
@@ -17,6 +16,8 @@ addons:
       - google-chrome
     packages:
       - google-chrome-stable
+  sauce_connect: true
 script:
   - xvfb-run wct
   - "if [ \"${TRAVIS_PULL_REQUEST}\" = \"false\" ]; then wct -s 'default'; fi"
+dist: trusty
diff --git a/dashboard-ui/bower_components/paper-button/CONTRIBUTING.md b/dashboard-ui/bower_components/paper-button/CONTRIBUTING.md
index 7b10141565..093090d435 100644
--- a/dashboard-ui/bower_components/paper-button/CONTRIBUTING.md
+++ b/dashboard-ui/bower_components/paper-button/CONTRIBUTING.md
@@ -1,11 +1,16 @@
-
 <!--
 This file is autogenerated based on
 https://github.com/PolymerElements/ContributionGuide/blob/master/CONTRIBUTING.md
 
 If you edit that file, it will get updated everywhere else.
 If you edit this file, your changes will get overridden :)
+
+You can however override the jsbin link with one that's customized to this
+specific element:
+
+jsbin=https://jsbin.com/cagaye/edit?html,output
 -->
+
 # Polymer Elements
 ## Guide for Contributors
 
@@ -41,7 +46,7 @@ Polymer Elements are built in the open, and the Polymer authors eagerly encourag
  3. Click the `paper-foo` element.
  ```
 
- 2. **A reduced test case that demonstrates the problem.** If possible, please include the test case as a JSBin. Start with this template to easily import and use relevant Polymer Elements: [http://jsbin.com/cagaye](http://jsbin.com/cagaye/edit?html,output).
+ 2. **A reduced test case that demonstrates the problem.** If possible, please include the test case as a JSBin. Start with this template to easily import and use relevant Polymer Elements: [https://jsbin.com/cagaye/edit?html,output](https://jsbin.com/cagaye/edit?html,output).
 
  3. **A list of browsers where the problem occurs.** This can be skipped if the problem is the same across all browsers.
 
@@ -51,14 +56,14 @@ Polymer Elements are built in the open, and the Polymer authors eagerly encourag
 
 When submitting pull requests, please provide:
 
- 1. **A reference to the corresponding issue** or issues that will be closed by the pull request. Please refer to these issues using the following syntax:
+ 1. **A reference to the corresponding issue** or issues that will be closed by the pull request. Please refer to these issues in the pull request description using the following syntax:
 
  ```markdown
  (For a single issue)
  Fixes #20
 
  (For multiple issues)
- Fixes #32, #40
+ Fixes #32, fixes #40
  ```
 
  2. **A succinct description of the design** used to fix any related issues. For example:
diff --git a/dashboard-ui/bower_components/paper-button/bower.json b/dashboard-ui/bower_components/paper-button/bower.json
index bcb07a86c0..71a919d013 100644
--- a/dashboard-ui/bower_components/paper-button/bower.json
+++ b/dashboard-ui/bower_components/paper-button/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "paper-button",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Material design button",
   "authors": [
     "The Polymer Authors"
@@ -16,27 +16,26 @@
   "private": true,
   "repository": {
     "type": "git",
-    "url": "git://github.com/PolymerElements/paper-button"
+    "url": "git://github.com/PolymerElements/paper-button.git"
   },
   "license": "http://polymer.github.io/LICENSE.txt",
   "homepage": "https://github.com/PolymerElements/paper-button",
   "dependencies": {
     "polymer": "Polymer/polymer#^1.1.0",
-    "paper-ripple": "polymerelements/paper-ripple#^1.0.0",
-    "paper-material": "polymerelements/paper-material#^1.0.0",
-    "paper-behaviors": "polymerelements/paper-behaviors#^1.0.0",
-    "iron-flex-layout": "polymerelements/iron-flex-layout#^1.0.0"
+    "iron-flex-layout": "PolymerElements/iron-flex-layout#^1.0.0",
+    "paper-behaviors": "PolymerElements/paper-behaviors#^1.0.0",
+    "paper-material": "PolymerElements/paper-material#^1.0.0"
   },
   "devDependencies": {
-    "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
-    "web-component-tester": "polymer/web-component-tester#^3.4.0",
-    "test-fixture": "polymerelements/test-fixture#^1.0.0",
-    "iron-component-page": "polymerelements/iron-component-page#^1.0.0",
+    "iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
     "iron-demo-helpers": "PolymerElements/iron-demo-helpers#^1.0.0",
-    "iron-icon": "polymerelements/iron-icon#^1.0.0",
-    "iron-icons": "polymerelements/iron-icons#^1.0.0",
-    "iron-test-helpers": "polymerelements/iron-test-helpers#^1.0.0",
-    "paper-styles": "polymerelements/paper-styles#^1.0.0"
+    "iron-icon": "PolymerElements/iron-icon#^1.0.0",
+    "iron-icons": "PolymerElements/iron-icons#^1.0.0",
+    "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0",
+    "paper-styles": "PolymerElements/paper-styles#^1.0.0",
+    "test-fixture": "PolymerElements/test-fixture#^1.0.0",
+    "web-component-tester": "^4.0.0",
+    "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
   "ignore": []
 }
diff --git a/dashboard-ui/bower_components/paper-button/demo/index.html b/dashboard-ui/bower_components/paper-button/demo/index.html
index 4f57bd5f8e..c2130909f3 100644
--- a/dashboard-ui/bower_components/paper-button/demo/index.html
+++ b/dashboard-ui/bower_components/paper-button/demo/index.html
@@ -117,6 +117,22 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
         </style>
       </template>
     </demo-snippet>
+
+    <h3>Buttons can be used as a link</h3>
+    <demo-snippet class="centered-demo">
+      <template>
+        <a href="https://www.polymer-project.org/" tabindex="-1">
+          <paper-button raised>Polymer Project</paper-button>
+        </a>
+        <style>
+          a paper-button,
+          a:active paper-button,
+          a:visited paper-button {
+            color: #000;
+          }
+        </style>
+      </template>
+    </demo-snippet>
   </div>
 </body>
 </html>
diff --git a/dashboard-ui/bower_components/paper-button/paper-button.html b/dashboard-ui/bower_components/paper-button/paper-button.html
index c5a0d18431..bf3b083b74 100644
--- a/dashboard-ui/bower_components/paper-button/paper-button.html
+++ b/dashboard-ui/bower_components/paper-button/paper-button.html
@@ -9,10 +9,9 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
 -->
 
 <link rel="import" href="../polymer/polymer.html">
-<link rel="import" href="../paper-material/paper-material.html">
-<link rel="import" href="../paper-ripple/paper-ripple.html">
-<link rel="import" href="../paper-behaviors/paper-button-behavior.html">
 <link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
+<link rel="import" href="../paper-behaviors/paper-button-behavior.html">
+<link rel="import" href="../paper-material/paper-material.html">
 
 <!--
 Material design: [Buttons](https://www.google.com/design/spec/components/buttons.html)
@@ -40,6 +39,14 @@ create a button with an icon and some text:
       custom button content
     </paper-button>
 
+To use `paper-button` as a link, wrap it in an anchor tag. Since `paper-button` will already
+receive focus, you may want to prevent the anchor tag from receiving focus as well by setting
+its tabindex to -1.
+
+    <a href="https://www.polymer-project.org/" tabindex="-1">
+      <paper-button raised>Polymer Project</paper-button>
+    </a>
+
 ### Styling
 
 Style the button with CSS as you would a normal DOM element.
@@ -76,16 +83,17 @@ Custom property | Description | Default
 
 <dom-module id="paper-button">
   <template strip-whitespace>
-
     <style include="paper-material">
       :host {
-        display: inline-block;
+        @apply(--layout-inline);
+        @apply(--layout-center-center);
         position: relative;
         box-sizing: border-box;
         min-width: 5.14em;
         margin: 0 0.29em;
         background: transparent;
-        text-align: center;
+        -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+        -webkit-tap-highlight-color: transparent;
         font: inherit;
         text-transform: uppercase;
         outline-width: 0;
@@ -98,6 +106,7 @@ Custom property | Description | Default
         z-index: 0;
         padding: 0.7em 0.57em;
 
+        @apply(--paper-font-common-base);
         @apply(--paper-button);
       }
 
@@ -123,50 +132,47 @@ Custom property | Description | Default
       paper-ripple {
         color: var(--paper-button-ink-color);
       }
-
-      :host > ::content * {
-        text-transform: inherit;
-      }
     </style>
+
     <content></content>
   </template>
-</dom-module>
 
-<script>
-  Polymer({
-    is: 'paper-button',
+  <script>
+    Polymer({
+      is: 'paper-button',
 
-    behaviors: [
-      Polymer.PaperButtonBehavior
-    ],
+      behaviors: [
+        Polymer.PaperButtonBehavior
+      ],
+
+      properties: {
+        /**
+         * If true, the button should be styled with a shadow.
+         */
+        raised: {
+          type: Boolean,
+          reflectToAttribute: true,
+          value: false,
+          observer: '_calculateElevation'
+        }
+      },
+
+      _calculateElevation: function() {
+        if (!this.raised) {
+          this._setElevation(0);
+        } else {
+          Polymer.PaperButtonBehaviorImpl._calculateElevation.apply(this);
+        }
+      }
 
-    properties: {
       /**
-       * If true, the button should be styled with a shadow.
-       */
-      raised: {
-        type: Boolean,
-        reflectToAttribute: true,
-        value: false,
-        observer: '_calculateElevation'
-      }
-    },
+      Fired when the animation finishes.
+      This is useful if you want to wait until
+      the ripple animation finishes to perform some action.
 
-    _calculateElevation: function() {
-      if (!this.raised) {
-        this._setElevation(0);
-      } else {
-        Polymer.PaperButtonBehaviorImpl._calculateElevation.apply(this);
-      }
-    }
-    /**
-
-    Fired when the animation finishes.
-    This is useful if you want to wait until
-    the ripple animation finishes to perform some action.
-
-    @event transitionend
-    @param {{node: Object}} detail Contains the animated node.
-    */
-  });
-</script>
+      @event transitionend
+      Event param: {{node: Object}} detail Contains the animated node.
+      */
+    });
+  </script>
+</dom-module>
diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html
index dbc5c3cd0a..73276f836d 100644
--- a/dashboard-ui/cinemamodeconfiguration.html
+++ b/dashboard-ui/cinemamodeconfiguration.html
@@ -1,4 +1,4 @@
-<div id="cinemaModeConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Cinema-Mode" data-require="scripts/cinemamodeconfiguration,paper-checkbox,paper-input,paper-button">
+<div id="cinemaModeConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Cinema-Mode" data-require="scripts/cinemamodeconfiguration,paper-checkbox,paper-input,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -66,9 +66,7 @@
                 </div>
                 <br />
                 <br />
-                <button type="submit" data-role="none" class="clearButton">
-                    <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                </button>
+                <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                 <p>${CinemaModeConfigurationHelp2}</p>
             </form>
         </div>
diff --git a/dashboard-ui/components/directorybrowser/directorybrowser.js b/dashboard-ui/components/directorybrowser/directorybrowser.js
index f7e603021d..ab92b23adf 100644
--- a/dashboard-ui/components/directorybrowser/directorybrowser.js
+++ b/dashboard-ui/components/directorybrowser/directorybrowser.js
@@ -143,7 +143,7 @@
         html += '<div class="results paperList" style="height: 180px; overflow-y: auto;"></div>';
 
         html += '<div>';
-        html += '<button type="submit" class="clearButton" data-role="none"><paper-button raised class="submit block">' + Globalize.translate('ButtonOk') + '</paper-button></button>';
+        html += '<button is="emby-button" type="submit" class="raised submit block">' + Globalize.translate('ButtonOk') + '</button>';
         html += '</div>';
 
         html += '</form>';
diff --git a/dashboard-ui/components/favoriteitems.js b/dashboard-ui/components/favoriteitems.js
index e4952e7f48..1416a3484b 100644
--- a/dashboard-ui/components/favoriteitems.js
+++ b/dashboard-ui/components/favoriteitems.js
@@ -76,7 +76,7 @@
                 if (result.TotalRecordCount > result.Items.length) {
                     var href = "secondaryitems.html?type=" + section.types + "&filters=IsFavorite&titlekey=" + section.name;
 
-                    html += '<a class="clearLink" href="' + href + '" style="margin-left:2em;"><paper-button raised class="more mini">' + Globalize.translate('ButtonMore') + '</paper-button></a>';
+                    html += '<a class="clearLink" href="' + href + '" style="margin-left:2em;"><button is="emby-button" type="button" class="raised more mini">' + Globalize.translate('ButtonMore') + '</button></a>';
                 }
 
                 html += '</div>';
diff --git a/dashboard-ui/components/fileorganizer/fileorganizer.template.html b/dashboard-ui/components/fileorganizer/fileorganizer.template.html
index 7c72e7412d..372a348f8e 100644
--- a/dashboard-ui/components/fileorganizer/fileorganizer.template.html
+++ b/dashboard-ui/components/fileorganizer/fileorganizer.template.html
@@ -36,8 +36,6 @@
         <paper-checkbox type="checkbox" id="chkRememberCorrection">${OptionRememberOrganizeCorrection} <span class="extractedName" style="font-weight: bold; font-style: italic" /></paper-checkbox>
     </div>
     <br />
-    <button type="submit" data-role="none" class="clearButton">
-        <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonOk}</span></paper-button>
-    </button>
+    <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonOk}</span></button>
     <input id="hfResultId" type="hidden" />
 </form>
\ No newline at end of file
diff --git a/dashboard-ui/components/guestinviter/guestinviter.template.html b/dashboard-ui/components/guestinviter/guestinviter.template.html
index 93d050889c..8484ebec08 100644
--- a/dashboard-ui/components/guestinviter/guestinviter.template.html
+++ b/dashboard-ui/components/guestinviter/guestinviter.template.html
@@ -24,7 +24,5 @@
     </emby-collapsible>
     <p class="fieldDescription" style="margin-top:.5em;">${MessageGuestSharingPermissionsHelp}</p>
     <br />
-    <button type="submit" data-role="none" class="clearButton">
-        <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSendInvitation}</span></paper-button>
-    </button>
+    <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSendInvitation}</span></button>
 </form>
\ No newline at end of file
diff --git a/dashboard-ui/components/imageuploader/imageuploader.template.html b/dashboard-ui/components/imageuploader/imageuploader.template.html
index def6449037..0f190f270f 100644
--- a/dashboard-ui/components/imageuploader/imageuploader.template.html
+++ b/dashboard-ui/components/imageuploader/imageuploader.template.html
@@ -27,9 +27,7 @@
                     <option value="Thumb">${OptionThumb}</option>
                 </select>
             </div>
-            <button type="submit" data-role="none" class="clearButton">
-                <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonUpload}</span></paper-button>
-            </button>
+            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonUpload}</span></button>
         </div>
     </div>
 </form>
\ No newline at end of file
diff --git a/dashboard-ui/components/itemidentifier/itemidentifier.template.html b/dashboard-ui/components/itemidentifier/itemidentifier.template.html
index 9cd6b9d81b..1bd8b78d96 100644
--- a/dashboard-ui/components/itemidentifier/itemidentifier.template.html
+++ b/dashboard-ui/components/itemidentifier/itemidentifier.template.html
@@ -11,16 +11,14 @@
         <input is="emby-input" type="text" id="txtLookupName" class="identifyField" data-lookup="Name" label="${LabelName}" />
     </div>
     <div class="fldLookupYear inputContainer">
-        <input is="emby-input" type="number" id="txtLookupYear" class="identifyField" data-lookup="Year" pattern="[0-9]*" min="1800" label="${LabelYear}"/>
+        <input is="emby-input" type="number" id="txtLookupYear" class="identifyField" data-lookup="Year" pattern="[0-9]*" min="1800" label="${LabelYear}" />
     </div>
 
     <div class="identifyProviderIds">
     </div>
 
     <p>
-        <button type="submit" data-role="none" class="clearButton">
-            <paper-button raised class="submit block"><iron-icon icon="search"></iron-icon><span>${ButtonSearch}</span></paper-button>
-        </button>
+        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="search"></iron-icon><span>${ButtonSearch}</span></button>
     </p>
 </form>
 <div class="identificationSearchResults" style="display:none; text-align: center;">
@@ -36,7 +34,5 @@
         <paper-checkbox id="chkIdentifyReplaceImages" checked>${OptionReplaceExistingImages}</paper-checkbox>
     </div>
     <br />
-    <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>
+    <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSubmit}</span></button>
 </form>
diff --git a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
index 1e4f74d7c0..15c36e196e 100644
--- a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
+++ b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
@@ -16,20 +16,18 @@
     </div>
     <div>
         <h1 style="display:inline-block;vertical-align:middle;">${HeadersFolders}</h1>
-        <paper-button raised class="btnAddFolder submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+        <button is="emby-button" type="button" class="raised btnAddFolder submit mini" style="margin-left:1em;" title="${ButtonAdd}">
             <iron-icon icon="add"></iron-icon>
             <span>${ButtonAdd}</span>
-        </paper-button>
+        </button>
     </div>
     <div class="paperList folderList hide" style="padding: .7em 0;"></div>
 
     <br />
     <div>
-        <button type="submit" class="clearButton" data-role="none">
-            <paper-button raised class="submit block">
-                <iron-icon icon="check"></iron-icon>
-                <span>${ButtonOk}</span>
-            </paper-button>
+        <button is="emby-button" type="submit" class="raised submit block">
+            <iron-icon icon="check"></iron-icon>
+            <span>${ButtonOk}</span>
         </button>
     </div>
 </form>
\ No newline at end of file
diff --git a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.template.html b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.template.html
index a86b0e9d72..f4dbf3a691 100644
--- a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.template.html
+++ b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.template.html
@@ -1,8 +1,8 @@
 <div>
     <h1 style="display:inline-block;vertical-align:middle;">${HeadersFolders}</h1>
-    <paper-button raised class="btnAddFolder submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+    <button is="emby-button" type="button" class="raised btnAddFolder submit mini" style="margin-left:1em;" title="${ButtonAdd}">
         <iron-icon icon="add"></iron-icon>
         <span>${ButtonAdd}</span>
-    </paper-button>
+    </button>
 </div>
 <div class="paperList folderList" style="padding:.7em 0;"></div>
\ No newline at end of file
diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.template.html b/dashboard-ui/components/metadataeditor/metadataeditor.template.html
index 1c56b952a4..18f04261d0 100644
--- a/dashboard-ui/components/metadataeditor/metadataeditor.template.html
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.template.html
@@ -4,10 +4,10 @@
         ${ButtonEdit}
     </div>
     <div style="margin-left:auto; display: flex; align-items: center; justify-content: center;">
-        <paper-button class="btnHeaderSave accent" tabindex="-1">
+        <button is="emby-button" type="button" class="btnHeaderSave accent" tabindex="-1">
             <iron-icon icon="check"></iron-icon>
             <span>${ButtonSave}</span>
-        </paper-button>
+        </button>
         <button is="paper-icon-button-light" class="btnMore" tabindex="-1"><iron-icon icon="more-vert"></iron-icon></button>
     </div>
 </div>
@@ -35,7 +35,7 @@
             <div id="fldDateAdded" style="display: none;">
                 <paper-input id="txtDateAdded" type="date" label="${LabelDateAdded}"></paper-input>
                 <div class="fieldDescription">${ConfigureDateAdded}</div>
-                <br/>
+                <br />
             </div>
             <div id="fldStatus" style="display: none;margin:1em 0;">
                 <label for="selectStatus" class="selectLabel">${LabelStatus}</label>
@@ -223,30 +223,30 @@
             <h1 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
                 ${HeaderCountries}
             </h1>
-            <paper-button raised class="btnAddTextItem submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+            <button is="emby-button" type="button" class="raised btnAddTextItem submit mini" style="margin-left:1em;" title="${ButtonAdd}">
                 <iron-icon icon="add"></iron-icon>
                 <span>${ButtonAdd}</span>
-            </paper-button>
+            </button>
             <div class="paperList" id="listCountries"></div>
         </div>
         <div id="genresCollapsible" class="editableListviewContainer" style="display: none; margin-top: 3em;">
             <h1 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
                 ${HeaderGenres}
             </h1>
-            <paper-button raised class="btnAddTextItem submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+            <button is="emby-button" type="button" class="raised btnAddTextItem submit mini" style="margin-left:1em;" title="${ButtonAdd}">
                 <iron-icon icon="add"></iron-icon>
                 <span>${ButtonAdd}</span>
-            </paper-button>
+            </button>
             <div class="paperList" id="listGenres"></div>
         </div>
         <div data-mini="true" data-role="collapsible" id="peopleCollapsible" style="display: none; margin-top: 3em;">
             <h1 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
                 ${HeaderPeople}
             </h1>
-            <paper-button raised id="btnAddPerson" class="btnAddPerson submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+            <button is="emby-button" type="button" raised id="btnAddPerson" class="btnAddPerson submit mini" style="margin-left:1em;" title="${ButtonAdd}">
                 <iron-icon icon="add"></iron-icon>
                 <span>${ButtonAdd}</span>
-            </paper-button>
+            </button>
             <div id="peopleList" class="paperList">
             </div>
         </div>
@@ -254,30 +254,30 @@
             <h1 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
                 ${HeaderPlotKeywords}
             </h1>
-            <paper-button raised class="btnAddTextItem submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+            <button is="emby-button" type="button" class="raised btnAddTextItem submit mini" style="margin-left:1em;" title="${ButtonAdd}">
                 <iron-icon icon="add"></iron-icon>
                 <span>${ButtonAdd}</span>
-            </paper-button>
+            </button>
             <div class="paperList" id="listKeywords"></div>
         </div>
         <div id="studiosCollapsible" class="editableListviewContainer" style="display: none; margin-top: 3em;">
             <h1 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
                 ${HeaderStudios}
             </h1>
-            <paper-button raised class="btnAddTextItem submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+            <button is="emby-button" type="button" class="raised btnAddTextItem submit mini" style="margin-left:1em;" title="${ButtonAdd}">
                 <iron-icon icon="add"></iron-icon>
                 <span>${ButtonAdd}</span>
-            </paper-button>
+            </button>
             <div class="paperList" id="listStudios"></div>
         </div>
         <div id="tagsCollapsible" class="editableListviewContainer" style="display: none; margin-top: 3em;">
             <h1 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
                 ${HeaderTags}
             </h1>
-            <paper-button raised class="btnAddTextItem submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+            <button is="emby-button" type="button" class="raised btnAddTextItem submit mini" style="margin-left:1em;" title="${ButtonAdd}">
                 <iron-icon icon="add"></iron-icon>
                 <span>${ButtonAdd}</span>
-            </paper-button>
+            </button>
             <div class="paperList" id="listTags"></div>
         </div>
         <div id="metadataSettingsCollapsible" style="display: none; margin-top: 3em;">
@@ -305,9 +305,7 @@
             </div>
         </div>
         <br />
-        <button type="submit" data-role="none" class="clearButton btnSave">
-            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-        </button>
+        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
     </div>
     <br />
     <br />
diff --git a/dashboard-ui/components/metadataeditor/personeditor.template.html b/dashboard-ui/components/metadataeditor/personeditor.template.html
index ce19bc7830..af581bcb1b 100644
--- a/dashboard-ui/components/metadataeditor/personeditor.template.html
+++ b/dashboard-ui/components/metadataeditor/personeditor.template.html
@@ -29,7 +29,5 @@
         <div class="fieldDescription">${LabelPersonRoleHelp}</div>
     </div>
     <br />
-    <button type="submit" data-role="none" class="clearButton">
-        <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonOk}</span></paper-button>
-    </button>
+    <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonOk}</span></button>
 </form>
\ No newline at end of file
diff --git a/dashboard-ui/components/tvproviders/schedulesdirect.template.html b/dashboard-ui/components/tvproviders/schedulesdirect.template.html
index 33c15be14d..fef8142ae5 100644
--- a/dashboard-ui/components/tvproviders/schedulesdirect.template.html
+++ b/dashboard-ui/components/tvproviders/schedulesdirect.template.html
@@ -20,9 +20,7 @@
             <paper-input class="txtPass" label="${LabelPassword}" required="required" autocomplete="off" type="password"></paper-input>
         </div>
         <div>
-            <button type="submit" data-role="none" class="clearButton">
-                <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-            </button>
+            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
 
         </div>
     </div>
@@ -66,10 +64,8 @@
             </div>
             <br /><br />
             <div>
-                <button type="submit" data-role="none" class="clearButton btnSubmitListingsContainer">
-                    <paper-button raised class="submit block btnSubmitListings hide"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                </button>
-                <paper-button raised class="cancel block btnCancel hide" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                <button is="emby-button" type="submit" class="raised submit block btnSubmitListingsContainer btnSubmitListings hide"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                <button is="emby-button" type="button" class="raised cancel block btnCancel hide" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
             </div>
         </div>
     </form>
diff --git a/dashboard-ui/components/tvproviders/xmltv.template.html b/dashboard-ui/components/tvproviders/xmltv.template.html
index f20909c50d..e66ef2d4d5 100644
--- a/dashboard-ui/components/tvproviders/xmltv.template.html
+++ b/dashboard-ui/components/tvproviders/xmltv.template.html
@@ -37,10 +37,7 @@
     </div>
     <br /><br />
     <div>
-        <button type="submit" data-role="none" class="clearButton btnSubmitListingsContainer">
-            <paper-button raised class="submit block btnSubmitListings hide"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-        </button>
-        <paper-button raised class="cancel block btnCancel hide" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
-    </div>
+        <button is="emby-button" type="submit" class="raised submit block btnSubmitListings hide"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+        <button is="emby-button" type="button" class="raised cancel block btnCancel hide" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
     </div>
 </form>
\ No newline at end of file
diff --git a/dashboard-ui/connectlogin.html b/dashboard-ui/connectlogin.html
index 7ab312c1d9..150a673075 100644
--- a/dashboard-ui/connectlogin.html
+++ b/dashboard-ui/connectlogin.html
@@ -1,4 +1,4 @@
-<div id="connectLoginPage" data-role="page" class="page standalonePage connectLoginPage" data-theme="b" data-require="scripts/connectlogin,emby-input,paper-button">
+<div id="connectLoginPage" data-role="page" class="page standalonePage connectLoginPage" data-theme="b" data-require="scripts/connectlogin,emby-input,emby-button">
 
     <div data-role="content">
 
@@ -8,30 +8,28 @@
 
             <h1 style="text-align: left;">${HeaderSignInWithConnect}</h1>
             <div class="inputContainer">
-                <input is="emby-input" type="text" id="txtManualName" required="required" label="${LabelUser}" autocomplete="off"/>
+                <input is="emby-input" type="text" id="txtManualName" required="required" label="${LabelUser}" autocomplete="off" />
                 <div class="fieldDescription" style="text-align:left;">${LabelEnterConnectUserNameHelp}</div>
             </div>
             <div class="inputContainer">
-                <input is="emby-input" type="password" id="txtManualPassword" required="required" label="${LabelPassword}" autocomplete="off"/>
+                <input is="emby-input" type="password" id="txtManualPassword" required="required" label="${LabelPassword}" autocomplete="off" />
             </div>
             <br />
-            <button type="submit" data-role="none" class="clearButton">
-                <paper-button raised class="accent block"><iron-icon icon="check"></iron-icon><span>${ButtonSignIn}</span></paper-button>
-            </button>
+            <button is="emby-button" type="submit" class="raised accent block"><iron-icon icon="check"></iron-icon><span>${ButtonSignIn}</span></button>
             <div class="forgotPassword">
                 <a href="https://emby.media/community/index.php?app=core&module=global&section=lostpass" target="_blank" class="clearLink">
-                    <paper-button raised class="cancel block"><iron-icon icon="close"></iron-icon><span>${ButtonForgotPassword}</span></paper-button>
+                    <button is="emby-button" type="button" class="raised cancel block"><iron-icon icon="close"></iron-icon><span>${ButtonForgotPassword}</span></button>
                 </a>
             </div>
             <div class="skip">
-                <paper-button raised class="cancel block btnSkipConnect"><iron-icon icon="close"></iron-icon><span>${ButtonSkip}</span></paper-button>
+                <button is="emby-button" type="button" class="raised cancel block btnSkipConnect"><iron-icon icon="close"></iron-icon><span>${ButtonSkip}</span></button>
                 <div class="fieldDescription" style="text-align:center;">${TextConnectToServerManually}</div>
             </div>
 
             <div class="newUsers" style="margin-top: 2em;">
                 <h2 style="text-align: left;">${HeaderNewUsers}</h2>
                 <a href="https://emby.media/community/index.php?app=core&module=global&section=register" target="_blank" class="clearLink">
-                    <paper-button raised class="submit block btnSignupForConnect"><iron-icon icon="add"></iron-icon><span>${ButtonSignUp}</span></paper-button>
+                    <button is="emby-button" type="button" class="raised submit block btnSignupForConnect"><iron-icon icon="add"></iron-icon><span>${ButtonSignUp}</span></button>
                 </a>
             </div>
             <div class="terms hide fieldDescription" style="margin-top: 2em; color: #ccc;"></div>
@@ -46,19 +44,17 @@
 
             <h1 style="text-align: left;">${HeaderConnectToServer}</h1>
             <div class="inputContainer">
-                <input is="emby-input" type="text" id="txtServerHost" required="required" label="${LabelServerHost}"/>
+                <input is="emby-input" type="text" id="txtServerHost" required="required" label="${LabelServerHost}" />
                 <div class="fieldDescription" style="text-align:left;">${LabelServerHostHelp}</div>
             </div>
             <br />
             <div class="inputContainer">
-                <input is="emby-input" type="number" id="txtServerPort" step="1" min="0" value="8096" label="${LabelServerPort}"/>
+                <input is="emby-input" type="number" id="txtServerPort" step="1" min="0" value="8096" label="${LabelServerPort}" />
             </div>
             <br />
 
-            <button type="submit" data-role="none" class="clearButton">
-                <paper-button raised class="accent block"><iron-icon icon="check"></iron-icon><span>${ButtonConnect}</span></paper-button>
-            </button>
-            <paper-button raised class="cancel block btnCancelManualServer"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+            <button is="emby-button" type="submit" class="raised accent block"><iron-icon icon="check"></iron-icon><span>${ButtonConnect}</span></button>
+            <button is="emby-button" type="button" class="raised cancel block btnCancelManualServer"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
         </form>
 
         <form class="signupForm" style="margin: 0 auto;display:none;">
@@ -70,25 +66,23 @@
             <h1 style="text-align: left;">${HeaderSignUp}</h1>
             <br />
             <div class="inputContainer">
-                <input is="emby-input" type="text" id="txtSignupEmail" required="required" label="${LabelEmail}"/>
+                <input is="emby-input" type="text" id="txtSignupEmail" required="required" label="${LabelEmail}" />
             </div>
             <div class="inputContainer">
-                <input is="emby-input" type="text" id="txtSignupUsername" required="required" label="${LabelUsername}"/>
+                <input is="emby-input" type="text" id="txtSignupUsername" required="required" label="${LabelUsername}" />
             </div>
             <div class="inputContainer">
-                <input is="emby-input" type="password" id="txtSignupPassword" required="required" label="${LabelPassword}" autocomplete="off"/>
+                <input is="emby-input" type="password" id="txtSignupPassword" required="required" label="${LabelPassword}" autocomplete="off" />
             </div>
             <div class="inputContainer">
-                <input is="emby-input" type="password" id="txtSignupPasswordConfirm" required="required" label="${LabelPasswordConfirm}" autocomplete="off"/>
+                <input is="emby-input" type="password" id="txtSignupPasswordConfirm" required="required" label="${LabelPasswordConfirm}" autocomplete="off" />
             </div>
 
             <div class="g-recaptcha" id="recaptchaWidget" data-sitekey="6Le2LAgTAAAAAK06Wvttt_yUnbISTy6q3Azqp9po" data-theme="dark"></div>
             <br />
 
-            <button type="submit" data-role="none" class="clearButton">
-                <paper-button raised class="accent block"><iron-icon icon="check"></iron-icon><span>${ButtonSignUp}</span></paper-button>
-            </button>
-            <paper-button raised class="cancel block btnCancelSignup"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+            <button is="emby-button" type="submit" class="raised accent block"><iron-icon icon="check"></iron-icon><span>${ButtonSignUp}</span></button>
+            <button is="emby-button" type="button" class="raised cancel block btnCancelSignup"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
         </form>
 
         <div class="welcomeContainer readOnlyContent" style="text-align: center; margin: 0 auto; display: none;">
@@ -99,7 +93,7 @@
                 <p style="margin: 2em 0;" class="embyIntroDownloadMessage"></p>
 
 
-                <paper-button raised class="accent block btnWelcomeNext iconRight"><iron-icon icon="arrow-forward"></iron-icon><span>${ButtonNext}</span></paper-button>
+                <button is="emby-button" type="button" class="raised accent block btnWelcomeNext iconRight"><iron-icon icon="arrow-forward"></iron-icon><span>${ButtonNext}</span></button>
             </div>
         </div>
     </div>
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 1dc73f59e4..c85b5331fd 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -96,7 +96,7 @@
     }
 }
 
-.listHeader + paper-button {
+.listHeader + button {
     margin-left: 2em;
 }
 
@@ -572,7 +572,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
     font-size: 20px;
 }
 
-    .detailSectionHeader paper-button {
+    .detailSectionHeader button {
         font-size: 13px;
     }
 
diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index de6251d523..2612f042eb 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -1,4 +1,4 @@
-<div id="dashboardPage" data-role="page" class="page type-interior dashboardHomePage" data-require="scripts/dashboardpage,humanedate,buttonenabled,paper-icon-item,paper-item-body,paper-fab,emby-collapsible,paper-button">
+<div id="dashboardPage" data-role="page" class="page type-interior dashboardHomePage" data-require="scripts/dashboardpage,humanedate,buttonenabled,paper-icon-item,paper-item-body,paper-fab,emby-collapsible,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -41,8 +41,8 @@
                             <p class="externalUrl"></p>
 
                             <div style="margin-top: 1em;">
-                                <paper-button raised class="subdued btnRestartContainer hide" onclick="DashboardPage.restart();"><iron-icon icon="refresh"></iron-icon><span>${ButtonRestart}</span></paper-button>
-                                <paper-button id="btnShutdown" raised class="subdued" onclick="DashboardPage.shutdown();"><iron-icon icon="close"></iron-icon><span>${ButtonShutdown}</span></paper-button>
+                                <button is="emby-button" type="button" class="raised subdued btnRestartContainer hide" onclick="DashboardPage.restart();"><iron-icon icon="refresh"></iron-icon><span>${ButtonRestart}</span></button>
+                                <button is="emby-button" type="button" id="btnShutdown" class="raised subdued" onclick="DashboardPage.shutdown();"><iron-icon icon="close"></iron-icon><span>${ButtonShutdown}</span></button>
                             </div>
                         </div>
                     </div>
@@ -57,7 +57,7 @@
                             </div>
                             <p>${MessagePleaseRestartServerToFinishUpdating}</p>
                             <div class="btnRestartContainer hide">
-                                <paper-button raised class="submit" onclick="DashboardPage.restart();"><iron-icon icon="refresh"></iron-icon><span>${ButtonRestartNow}</span></paper-button>
+                                <button is="emby-button" type="button" class="raised submit" onclick="DashboardPage.restart();"><iron-icon icon="refresh"></iron-icon><span>${ButtonRestartNow}</span></button>
                             </div>
                         </emby-collapsible>
                     </div>
diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html
index d8e94e173a..d129c89d11 100644
--- a/dashboard-ui/dashboardgeneral.html
+++ b/dashboard-ui/dashboardgeneral.html
@@ -122,9 +122,7 @@
                 <br />
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                     </li>
 
                 </ul>
diff --git a/dashboard-ui/dashboardhosting.html b/dashboard-ui/dashboardhosting.html
index 6e9af2f7b6..f83509a3fe 100644
--- a/dashboard-ui/dashboardhosting.html
+++ b/dashboard-ui/dashboardhosting.html
@@ -43,9 +43,7 @@
 
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                     </li>
 
                 </ul>
diff --git a/dashboard-ui/device.html b/dashboard-ui/device.html
index 23bbc74977..ab2367e3ab 100644
--- a/dashboard-ui/device.html
+++ b/dashboard-ui/device.html
@@ -1,4 +1,4 @@
-<div id="devicePage" data-role="page" class="page type-interior devicesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Devices" data-require="scripts/device,paper-input,paper-button">
+<div id="devicePage" data-role="page" class="page type-interior devicesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Devices" data-require="scripts/device,paper-input,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -24,9 +24,7 @@
                     </ul><br />
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <button type="submit" data-role="none" class="clearButton">
-                                <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                            </button>
+                            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                         </li>
                     </ul>
 
diff --git a/dashboard-ui/devicesupload.html b/dashboard-ui/devicesupload.html
index 1da43de5d3..19c7912d78 100644
--- a/dashboard-ui/devicesupload.html
+++ b/dashboard-ui/devicesupload.html
@@ -1,4 +1,4 @@
-<div id="devicesUploadPage" data-role="page" class="page type-interior devicesPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Camera%20upload" data-require="scripts/devicesupload,paper-input,paper-checkbox,paper-button">
+<div id="devicesUploadPage" data-role="page" class="page type-interior devicesPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Camera%20upload" data-require="scripts/devicesupload,paper-input,paper-checkbox,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -24,9 +24,7 @@
                     </ul><br />
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <button type="submit" data-role="none" class="clearButton">
-                                <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                            </button>
+                            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                         </li>
                     </ul>
 
diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html
index 34bde33828..171290af13 100644
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@@ -1,4 +1,4 @@
-<div id="dlnaProfilePage" data-role="page" class="page type-interior dlnaPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="jqmcollapsible,jqmpopup,scripts/dlnaprofile,jqmcheckbox,paper-button">
+<div id="dlnaProfilePage" data-role="page" class="page type-interior dlnaPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="jqmcollapsible,jqmpopup,scripts/dlnaprofile,jqmcheckbox,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -102,10 +102,10 @@
 
                             <div>
                                 <h2 style="vertical-align:middle;display:inline-block;">${HeaderHttpHeaders}</h2>
-                                <paper-button raised class="submit mini btnAddIdentificationHttpHeader" style="margin-left:1em;">
+                                <button is="emby-button" type="button" class="raised submit mini btnAddIdentificationHttpHeader" style="margin-left:1em;">
                                     <iron-icon icon="add"></iron-icon>
                                     <span>${ButtonNew}</span>
-                                </paper-button>
+                                </button>
                             </div>
                             <div class="httpHeaderIdentificationList"></div>
                         </div>
@@ -273,10 +273,10 @@
                         <div>
                             <div>
                                 <h2 style="vertical-align:middle;display:inline-block;">${HeaderXmlDocumentAttributes}</h2>
-                                <paper-button raised class="submit mini btnAddXmlDocumentAttribute" style="margin-left:1em;">
+                                <button is="emby-button" type="button" class="raised submit mini btnAddXmlDocumentAttribute" style="margin-left:1em;">
                                     <iron-icon icon="add"></iron-icon>
                                     <span>${ButtonNew}</span>
-                                </paper-button>
+                                </button>
                             </div>
                             <div class="xmlDocumentAttributeList"></div>
                             <div class="fieldDescription">${XmlDocumentAttributeListHelp}</div>
diff --git a/dashboard-ui/dlnaprofiles.html b/dashboard-ui/dlnaprofiles.html
index 89a573ee88..e14b98ef02 100644
--- a/dashboard-ui/dlnaprofiles.html
+++ b/dashboard-ui/dlnaprofiles.html
@@ -1,4 +1,4 @@
-<div id="dlnaProfilesPage" data-role="page" class="page type-interior dlnaPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="scripts/dlnaprofiles,paper-button">
+<div id="dlnaProfilesPage" data-role="page" class="page type-interior dlnaPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Dlna%20profiles" data-require="scripts/dlnaprofiles,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -9,10 +9,10 @@
                     <h2>${HeaderCustomDlnaProfiles}</h2>
                     <div style="position: absolute; right: 0; top: -12px;">
                         <a class="clearLink" href="dlnaprofile.html">
-                            <paper-button raised class="submit mini">
+                            <button is="emby-button" type="button" class="raised submit mini">
                                 <iron-icon icon="add"></iron-icon>
                                 <span>${ButtonNew}</span>
-                            </paper-button>
+                            </button>
                         </a>
                     </div>
                 </div>
diff --git a/dashboard-ui/dlnasettings.html b/dashboard-ui/dlnasettings.html
index 107929d486..0f83e85b92 100644
--- a/dashboard-ui/dlnasettings.html
+++ b/dashboard-ui/dlnasettings.html
@@ -1,4 +1,4 @@
-<div id="dlnaSettingsPage" data-role="page" class="page type-interior withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Play%20to" data-require="scripts/dlnasettings,paper-input,paper-checkbox,paper-button">
+<div id="dlnaSettingsPage" data-role="page" class="page type-interior withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Play%20to" data-require="scripts/dlnasettings,paper-input,paper-checkbox,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -44,9 +44,7 @@
                 </ul>
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                     </li>
                 </ul>
             </form>
diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html
index 3ea70ae64b..7ad113ebd2 100644
--- a/dashboard-ui/encodingsettings.html
+++ b/dashboard-ui/encodingsettings.html
@@ -1,4 +1,4 @@
-<div id="encodingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Transcoding" data-require="scripts/encodingsettings,paper-input,paper-checkbox,paper-button">
+<div id="encodingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Transcoding" data-require="scripts/encodingsettings,paper-input,paper-checkbox,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -55,9 +55,7 @@
 
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                     </li>
                 </ul>
             </form>
diff --git a/dashboard-ui/forgotpassword.html b/dashboard-ui/forgotpassword.html
index 8e3b658c92..602656b49c 100644
--- a/dashboard-ui/forgotpassword.html
+++ b/dashboard-ui/forgotpassword.html
@@ -1,4 +1,4 @@
-<div data-role="page" id="forgotPasswordPage" class="page standalonePage forgotPasswordPage" data-theme="b" data-require="scripts/forgotpassword,paper-input,paper-button">
+<div data-role="page" id="forgotPasswordPage" class="page standalonePage forgotPasswordPage" data-theme="b" data-require="scripts/forgotpassword,paper-input,emby-button">
 
     <div data-role="content">
 
@@ -15,11 +15,9 @@
                 <br />
 
                 <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>
+                    <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSubmit}</span></button>
 
-                    <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
                 </div>
             </div>
         </form>
diff --git a/dashboard-ui/forgotpasswordpin.html b/dashboard-ui/forgotpasswordpin.html
index f8a7d6f865..c4720925e7 100644
--- a/dashboard-ui/forgotpasswordpin.html
+++ b/dashboard-ui/forgotpasswordpin.html
@@ -1,4 +1,4 @@
-<div data-role="page" class="page standalonePage forgotPasswordPinPage" data-theme="b" data-require="scripts/forgotpasswordpin,paper-input,paper-button">
+<div data-role="page" class="page standalonePage forgotPasswordPinPage" data-theme="b" data-require="scripts/forgotpasswordpin,paper-input,emby-button">
 
     <div data-role="content">
 
@@ -14,11 +14,9 @@
                 <br />
 
                 <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>
+                    <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSubmit}</span></button>
 
-                    <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
                 </div>
             </div>
         </form>
diff --git a/dashboard-ui/home.html b/dashboard-ui/home.html
index 69c00b884d..328619926a 100644
--- a/dashboard-ui/home.html
+++ b/dashboard-ui/home.html
@@ -10,7 +10,7 @@
         <div class="ui-bar-b readOnlyContent welcomeMessage hide" style="padding: 2em; border-radius: 10px; margin: 2em auto; font-weight: normal;">
             <h1 style="margin-top: 0;" class="tourHeader"></h1>
             <p>
-                <paper-button raised class="submit block btnTakeTour"><iron-icon icon="check"></iron-icon><span class="tourButtonText"></span></paper-button>
+                <button is="emby-button" type="button" class="raised submit block btnTakeTour"><iron-icon icon="check"></iron-icon><span class="tourButtonText"></span></button>
             </p>
         </div>
 
@@ -20,7 +20,7 @@
         <div class="homePageSection">
             <div>
                 <h1 class="listHeader nextUpHeader" style="display: inline-block; vertical-align: middle;">${HeaderNextUp}</h1>
-                <paper-button raised class="submit mini categorySyncButton" data-category="NextUp"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></paper-button>
+                <button is="emby-button" type="button" class="raised submit mini categorySyncButton" data-category="NextUp"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></button>
             </div>
             <div id="nextUpItems" class="itemsContainer">
             </div>
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 7ed1d65a17..e25e019669 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -3,8 +3,8 @@
     <div id="itemBackdrop" class="itemBackdrop noBackdrop">
         <div class="itemBackdropContent">
         </div>
-        <a href="#" id="lnkPreviousItem" class="lnkPreviousItem lnkSibling hide clearLink"><paper-button raised class="subdued notext"><iron-icon icon="arrow-back"></iron-icon></paper-button></a>
-        <a href="#" id="lnkNextItem" class="lnkNextItem lnkSibling hide clearLink"><paper-button raised class="subdued notext"><iron-icon icon="arrow-forward"></iron-icon></paper-button></a>
+        <a href="#" id="lnkPreviousItem" class="lnkPreviousItem lnkSibling hide clearLink"><button is="emby-button" type="button" class="raised subdued notext"><iron-icon icon="arrow-back"></iron-icon></button></a>
+        <a href="#" id="lnkNextItem" class="lnkNextItem lnkSibling hide clearLink"><button is="emby-button" type="button" class="raised subdued notext"><iron-icon icon="arrow-forward"></iron-icon></button></a>
     </div>
 
     <div class="detailPageContent" style="position:relative;">
@@ -27,12 +27,12 @@
                 <p class="artist"></p>
                 <p class="itemGenres"></p>
                 <div class="detailButtonsContainer">
-                    <paper-button raised class="subdued btnPlayTrailer hide"><iron-icon icon="play-arrow"></iron-icon><span>${ButtonTrailer}</span></paper-button>
-                    <a class="btnPlayExternalTrailer hide clearLink" href="#" target="_blank"><paper-button raised class="subdued"><iron-icon icon="play-arrow"></iron-icon><span>${ButtonTrailer}</span></paper-button></a>
-                    <paper-button raised class="subdued btnRecord hide"><iron-icon icon="videocam"></iron-icon><span>${ButtonRecord}</span></paper-button>
-                    <paper-button raised class="subdued hide btnCancelRecording"><iron-icon icon="delete"></iron-icon><span>${ButtonCancelRecording}</span></paper-button>
-                    <paper-button raised class="subdued btnSync hide"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></paper-button>
-                    <paper-button raised class="subdued btnMoreCommands hide notext"><iron-icon icon="more-vert"></iron-icon></paper-button>
+                    <button is="emby-button" type="button" class="raised subdued btnPlayTrailer hide"><iron-icon icon="play-arrow"></iron-icon><span>${ButtonTrailer}</span></button>
+                    <a class="btnPlayExternalTrailer hide clearLink" href="#" target="_blank"><button is="emby-button" type="button" class="raised subdued"><iron-icon icon="play-arrow"></iron-icon><span>${ButtonTrailer}</span></button></a>
+                    <button is="emby-button" type="button" class="raised subdued btnRecord hide"><iron-icon icon="videocam"></iron-icon><span>${ButtonRecord}</span></button>
+                    <button is="emby-button" type="button" class="raised subdued hide btnCancelRecording"><iron-icon icon="delete"></iron-icon><span>${ButtonCancelRecording}</span></button>
+                    <button is="emby-button" type="button" class="raised subdued btnSync hide"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></button>
+                    <button is="emby-button" type="button" class="raised subdued btnMoreCommands hide notext"><iron-icon icon="more-vert"></iron-icon></button>
                     <div class="detailUserDataIcons userDataIcons"></div>
                 </div>
             </div>
@@ -45,12 +45,12 @@
         </div>
         <div class="detailButtonsContainer">
             <br />
-            <paper-button raised class="subdued btnPlayTrailer hide"><iron-icon icon="play-arrow"></iron-icon><span>${ButtonTrailer}</span></paper-button>
-            <a class="btnPlayExternalTrailer hide clearLink" href="#" target="_blank"><paper-button raised class="subdued"><iron-icon icon="play-arrow"></iron-icon><span>${ButtonTrailer}</span></paper-button></a>
-            <paper-button raised class="subdued btnRecord hide"><iron-icon icon="videocam"></iron-icon><span>${ButtonRecord}</span></paper-button>
-            <paper-button raised class="subdued hide btnCancelRecording"><iron-icon icon="delete"></iron-icon><span>${ButtonCancelRecording}</span></paper-button>
-            <paper-button raised class="subdued btnSync hide"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></paper-button>
-            <paper-button raised class="subdued btnMoreCommands hide notext"><iron-icon icon="more-vert"></iron-icon></paper-button>
+            <button is="emby-button" type="button" class="raised subdued btnPlayTrailer hide"><iron-icon icon="play-arrow"></iron-icon><span>${ButtonTrailer}</span></button>
+            <a class="btnPlayExternalTrailer hide clearLink" href="#" target="_blank"><button is="emby-button" type="button" class="raised subdued"><iron-icon icon="play-arrow"></iron-icon><span>${ButtonTrailer}</span></button></a>
+            <button is="emby-button" type="button" class="raised subdued btnRecord hide"><iron-icon icon="videocam"></iron-icon><span>${ButtonRecord}</span></button>
+            <button is="emby-button" type="button" class="raised subdued hide btnCancelRecording"><iron-icon icon="delete"></iron-icon><span>${ButtonCancelRecording}</span></button>
+            <button is="emby-button" type="button" class="raised subdued btnSync hide"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></button>
+            <button is="emby-button" type="button" class="raised subdued btnMoreCommands hide notext"><iron-icon icon="more-vert"></iron-icon></button>
             <div class="detailUserDataIcons userDataIcons"></div>
         </div>
     </div>
@@ -183,7 +183,7 @@
                 <h1>${HeaderMediaInfo}</h1>
                 <div>
                     <div class="splitVersionContainer" style="border-bottom: 1px solid #444;padding:1em 0;">
-                        <paper-button raised class="btnSplitVersions subdued">${ButtonSplitVersionsApart}</paper-button>
+                        <button is="emby-button" type="button" class="raised btnSplitVersions subdued">${ButtonSplitVersionsApart}</button>
                     </div>
                     <div id="mediaInfoContent" class="mediaInfoContent"></div>
                 </div>
diff --git a/dashboard-ui/library.html b/dashboard-ui/library.html
index 8f8785b346..7b50b5e52b 100644
--- a/dashboard-ui/library.html
+++ b/dashboard-ui/library.html
@@ -6,7 +6,7 @@
             <br />
             <div>
 
-                <paper-button raised class="btnRefresh subdued"><iron-icon icon="refresh"></iron-icon><span>${ButtonScanLibrary}</span></paper-button>
+                <button is="emby-button" type="button" class="raised btnRefresh subdued"><iron-icon icon="refresh"></iron-icon><span>${ButtonScanLibrary}</span></button>
                 <progress max="100" min="0" style="display: inline-block; vertical-align: middle;" class="refreshProgress"></progress>
             </div>
         </div>
diff --git a/dashboard-ui/librarydisplay.html b/dashboard-ui/librarydisplay.html
index e1dc482c7b..bae5bc95f2 100644
--- a/dashboard-ui/librarydisplay.html
+++ b/dashboard-ui/librarydisplay.html
@@ -9,9 +9,7 @@
                 </div>
                 <br />
                 <br />
-                <button type="submit" data-role="none" class="clearButton">
-                    <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                </button>
+                <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
 
             </form>
         </div>
diff --git a/dashboard-ui/librarypathmapping.html b/dashboard-ui/librarypathmapping.html
index 074a9f64e7..557feee496 100644
--- a/dashboard-ui/librarypathmapping.html
+++ b/dashboard-ui/librarypathmapping.html
@@ -26,9 +26,7 @@
                         <div class="fieldDescription">${LabelToHelp}</div>
                     </div>
                     <br />
-                    <button type="submit" data-role="none" class="clearButton">
-                        <paper-button raised class="submit block"><iron-icon icon="add"></iron-icon><span>${ButtonAdd}</span></paper-button>
-                    </button>
+                    <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="add"></iron-icon><span>${ButtonAdd}</span></button>
                 </div>
 
             </form>
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index bca0ee844e..b21e4e4b56 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -123,9 +123,7 @@
 
                 <br />
                 <br />
-                <button type="submit" data-role="none" class="clearButton">
-                    <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                </button>
+                <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
 
             </form>
 
diff --git a/dashboard-ui/livetv.html b/dashboard-ui/livetv.html
index de77b5c242..85f87b8081 100644
--- a/dashboard-ui/livetv.html
+++ b/dashboard-ui/livetv.html
@@ -21,7 +21,7 @@
         <div id="upcomingTvMovies" class="homePageSection" style="margin-top: 1em;">
             <div>
                 <h1 class="listHeader" style="display: inline-block; vertical-align: middle;">${HeaderUpcomingMovies}</h1>
-                <a href="livetvitems.html?type=movies" class="clearLink" style="margin-left: 1em; vertical-align: middle;"><paper-button raised class="more mini noIcon">${ButtonMoreItems}</paper-button></a>
+                <a href="livetvitems.html?type=movies" class="clearLink" style="margin-left: 1em; vertical-align: middle;"><button is="emby-button" type="button" class="raised more mini noIcon">${ButtonMoreItems}</button></a>
             </div>
             <div class="upcomingTvMovieItems itemsContainer noautoinit"></div>
             <br />
@@ -29,7 +29,7 @@
         <div id="upcomingSports" class="homePageSection" style="margin-top: 1em;">
             <div>
                 <h1 class="listHeader" style="display: inline-block; vertical-align: middle;">${HeaderUpcomingSports}</h1>
-                <a href="livetvitems.html?type=sports" class="clearLink" style="margin-left: 1em; vertical-align: middle;"><paper-button raised class="more mini noIcon">${ButtonMoreItems}</paper-button></a>
+                <a href="livetvitems.html?type=sports" class="clearLink" style="margin-left: 1em; vertical-align: middle;"><button is="emby-button" type="button" class="raised more mini noIcon">${ButtonMoreItems}</button></a>
             </div>
             <div class="upcomingSportsItems itemsContainer noautoinit"></div>
             <br />
@@ -37,7 +37,7 @@
         <div id="upcomingKids" class="homePageSection" style="margin-top: 1em;">
             <div>
                 <h1 class="listHeader" style="display: inline-block; vertical-align: middle;">${HeaderUpcomingForKids}</h1>
-                <a href="livetvitems.html?type=kids" class="clearLink" style="margin-left: 1em; vertical-align: middle;"><paper-button raised class="more mini noIcon">${ButtonMoreItems}</paper-button></a>
+                <a href="livetvitems.html?type=kids" class="clearLink" style="margin-left: 1em; vertical-align: middle;"><button is="emby-button" type="button" class="raised more mini noIcon">${ButtonMoreItems}</button></a>
             </div>
             <div class="upcomingKidsItems itemsContainer noautoinit"></div>
             <br />
@@ -61,7 +61,7 @@
         <div id="latestRecordings" class="homePageSection hide">
             <div>
                 <h1 class="listHeader" style="display: inline-block; vertical-align: middle;">${HeaderLatestRecordings}</h1>
-                <paper-button raised class="submit mini categorySyncButton" data-category="Latest"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></paper-button>
+                <button is="emby-button" type="button" class="raised submit mini categorySyncButton" data-category="Latest"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></button>
             </div>
             <div class="recordingItems itemsContainer"></div>
             <br />
diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html
index 21ee7edfcb..7b84f943b2 100644
--- a/dashboard-ui/livetvseriestimer.html
+++ b/dashboard-ui/livetvseriestimer.html
@@ -1,4 +1,4 @@
-<div id="liveTvSeriesTimerPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-contextname="${HeaderLiveTv}" data-require="jqmcheckbox,jqmcontrolgroup,paper-button,jqmcollapsible,scripts/livetvcomponents,scripts/livetvseriestimer,livetvcss,paper-checkbox,paper-input" data-backbutton="true" data-menubutton="false">
+<div id="liveTvSeriesTimerPage" data-role="page" class="page libraryPage liveTvPage noSecondaryNavPage" data-contextname="${HeaderLiveTv}" data-require="jqmcheckbox,jqmcontrolgroup,emby-button,jqmcollapsible,scripts/livetvcomponents,scripts/livetvseriestimer,livetvcss,paper-checkbox,paper-input" data-backbutton="true" data-menubutton="false">
 
     <div data-role="content">
 
@@ -58,11 +58,9 @@
                 </div>
                 <br />
                 <div>
-                    <button type="submit" data-role="none" class="clearButton">
-                        <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                    </button>
+                    <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
 
-                    <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
                 </div>
             </form>
 
diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html
index 72c108b2a0..0000d56db7 100644
--- a/dashboard-ui/livetvsettings.html
+++ b/dashboard-ui/livetvsettings.html
@@ -1,10 +1,7 @@
-<div id="liveTvSettingsPage" data-role="page" class="page type-interior liveTvPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvsettings,paper-checkbox,paper-input,emby-collapsible,paper-button">
-
+<div id="liveTvSettingsPage" data-role="page" class="page type-interior liveTvPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvsettings,paper-checkbox,paper-input,emby-collapsible,emby-button">
     <div data-role="content">
         <div class="content-primary">
-
             <form class="liveTvSettingsForm">
-
                 <ul data-role="listview" class="ulForm">
                     <li>
                         <label for="selectGuideDays" class="selectLabel">${LabelNumberOfGuideDays}</label>
@@ -77,18 +74,14 @@
                     <div>
                         <paper-input type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPostPaddingMinutes}"></paper-input>
                     </div>
-
                 </div>
                 <br />
                 <br />
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                     </li>
                 </ul>
-
             </form>
         </div>
     </div>
diff --git a/dashboard-ui/livetvstatus.html b/dashboard-ui/livetvstatus.html
index c446982816..7fca9fcf28 100644
--- a/dashboard-ui/livetvstatus.html
+++ b/dashboard-ui/livetvstatus.html
@@ -1,4 +1,4 @@
-<div id="liveTvStatusPage" data-role="page" class="page type-interior liveTvSettingsPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvstatus,scripts/taskbutton,paper-fab,paper-item-body,paper-icon-item,paper-checkbox,paper-button">
+<div id="liveTvStatusPage" data-role="page" class="page type-interior liveTvSettingsPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvstatus,scripts/taskbutton,paper-fab,paper-item-body,paper-icon-item,paper-checkbox,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -9,10 +9,10 @@
 
                     <div>
                         <h1 style="display:inline-block;vertical-align:middle;">${HeaderTunerDevices}</h1>
-                        <paper-button raised class="btnAddDevice submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+                        <button is="emby-button" type="button" class="raised btnAddDevice submit mini" style="margin-left:1em;" title="${ButtonAdd}">
                             <iron-icon icon="add"></iron-icon>
                             <span>${ButtonAdd}</span>
-                        </paper-button>
+                        </button>
                     </div>
                     <div class="devicesList">
                     </div>
@@ -21,17 +21,17 @@
                         <br />
                         <div>
                             <h1 style="display:inline-block;vertical-align:middle;">${HeaderGuideProviders}</h1>
-                            <paper-button raised class="btnAddProvider submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+                            <button is="emby-button" type="button" class="raised btnAddProvider submit mini" style="margin-left:1em;" title="${ButtonAdd}">
                                 <iron-icon icon="add"></iron-icon>
                                 <span>${ButtonAdd}</span>
-                            </paper-button>
+                            </button>
                         </div>
                         <p>${AddGuideProviderHelp}</p>
                         <div class="providerList">
                         </div>
                         <div>
 
-                            <paper-button raised class="btnRefresh block subdued"><iron-icon icon="refresh"></iron-icon><span>${ButtonRefreshGuideData}</span></paper-button>
+                            <button is="emby-button" type="button" class="raised btnRefresh block subdued"><iron-icon icon="refresh"></iron-icon><span>${ButtonRefreshGuideData}</span></button>
                             <progress max="100" min="0" style="width: 100%;" class="refreshGuideProgress"></progress>
                         </div>
                     </div>
diff --git a/dashboard-ui/livetvtunerprovider-hdhomerun.html b/dashboard-ui/livetvtunerprovider-hdhomerun.html
index 2c7c9c29f0..0982e9880b 100644
--- a/dashboard-ui/livetvtunerprovider-hdhomerun.html
+++ b/dashboard-ui/livetvtunerprovider-hdhomerun.html
@@ -1,4 +1,4 @@
-<div id="liveTvTunerProviderHdHomerunPage" data-role="page" class="page type-interior liveTvSettingsPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvtunerprovider-hdhomerun,paper-input,paper-checkbox,paper-button">
+<div id="liveTvTunerProviderHdHomerunPage" data-role="page" class="page type-interior liveTvSettingsPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvtunerprovider-hdhomerun,paper-input,paper-checkbox,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -31,10 +31,8 @@
                         <p>${DrmChannelsNotImported}</p>
                         <br />
                         <div>
-                            <button type="submit" data-role="none" class="clearButton">
-                                <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                            </button>
-                            <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                            <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
                         </div>
                     </div>
                 </form>
diff --git a/dashboard-ui/livetvtunerprovider-m3u.html b/dashboard-ui/livetvtunerprovider-m3u.html
index 26b1c464f5..940c77cb2a 100644
--- a/dashboard-ui/livetvtunerprovider-m3u.html
+++ b/dashboard-ui/livetvtunerprovider-m3u.html
@@ -1,4 +1,4 @@
-<div id="liveTvTunerProviderM3UPage" data-role="page" class="page type-interior liveTvSettingsPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvtunerprovider-m3u,paper-input,paper-button">
+<div id="liveTvTunerProviderM3UPage" data-role="page" class="page type-interior liveTvSettingsPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvtunerprovider-m3u,paper-input,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -15,10 +15,8 @@
                         </div>
                         <br />
                         <div>
-                            <button type="submit" data-role="none" class="clearButton">
-                                <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                            </button>
-                            <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                            <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
                         </div>
                     </div>
                 </form>
diff --git a/dashboard-ui/livetvtunerprovider-satip.html b/dashboard-ui/livetvtunerprovider-satip.html
index c7ec91869d..f1a73bb72c 100644
--- a/dashboard-ui/livetvtunerprovider-satip.html
+++ b/dashboard-ui/livetvtunerprovider-satip.html
@@ -61,10 +61,8 @@
                         </div>
                         <br /><br />
                         <div>
-                            <button type="submit" data-role="none" class="clearButton">
-                                <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                            </button>
-                            <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                            <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
                         </div>
                     </div>
                 </form>
diff --git a/dashboard-ui/login.html b/dashboard-ui/login.html
index e18d09f55e..7151f66469 100644
--- a/dashboard-ui/login.html
+++ b/dashboard-ui/login.html
@@ -9,19 +9,17 @@
             <div style="height:0; overflow: hidden;"><input type="text" name="fakeusernameremembered" tabindex="-1" /><input type="password" name="fakepasswordremembered" tabindex="-1" /></div>
 
             <div class="inputContainer">
-                <input is="emby-input" type="text" id="txtManualName" required="required" label="${LabelUser}" autocomplete="off"/>
+                <input is="emby-input" type="text" id="txtManualName" required="required" label="${LabelUser}" autocomplete="off" />
             </div>
 
             <div class="inputContainer">
-                <input is="emby-input" id="txtManualPassword" type="password" label="${LabelPassword}" autocomplete="off"/>
+                <input is="emby-input" id="txtManualPassword" type="password" label="${LabelPassword}" autocomplete="off" />
             </div>
 
             <br />
-            <button type="submit" data-role="none" class="clearButton">
-                <paper-button raised class="accent block"><iron-icon icon="check"></iron-icon><span>${ButtonSignIn}</span></paper-button>
-            </button>
+            <button is="emby-button" type="submit" class="raised accent block"><iron-icon icon="check"></iron-icon><span>${ButtonSignIn}</span></button>
             <div style="margin-top:.5em;">
-                <paper-button raised class="cancel block btnCancel"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                <button is="emby-button" type="button" class="raised cancel block btnCancel"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
             </div>
             <br />
             <br />
@@ -36,16 +34,16 @@
             <br />
 
             <div class="readOnlyContent" style="margin: 2em auto 0;">
-                <paper-button raised class="cancel block btnManual"><iron-icon icon="lock"></iron-icon><span>${ButtonManualLogin}</span></paper-button>
+                <button is="emby-button" type="button" class="raised cancel block btnManual"><iron-icon icon="lock"></iron-icon><span>${ButtonManualLogin}</span></button>
             </div>
         </div>
 
         <div class="readOnlyContent" style="margin: .5em auto 1em;">
-            <paper-button raised class="cancel block btnForgotPassword"><iron-icon icon="info"></iron-icon><span>${ButtonForgotPassword}</span></paper-button>
+            <button is="emby-button" type="button" class="raised cancel block btnForgotPassword"><iron-icon icon="info"></iron-icon><span>${ButtonForgotPassword}</span></button>
 
             <div class="connectButtons" style="display:none;">
                 <a href="selectserver.html" class="clearLink">
-                    <paper-button raised class="cancel block"><iron-icon icon="settings"></iron-icon><span>${ButtonChangeServer}</span></paper-button>
+                    <button is="emby-button" type="button" class="raised cancel block"><iron-icon icon="settings"></iron-icon><span>${ButtonChangeServer}</span></button>
                 </a>
             </div>
 
diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html
index dac8ed6fa5..53d3a1a72a 100644
--- a/dashboard-ui/metadata.html
+++ b/dashboard-ui/metadata.html
@@ -1,4 +1,4 @@
-<div id="metadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="scripts/metadataconfigurationpage,paper-checkbox,paper-button">
+<div id="metadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="scripts/metadataconfigurationpage,paper-checkbox,emby-button">
 
     <div data-role="content">
 
@@ -29,9 +29,7 @@
                         <select name="selectCountry" id="selectCountry" data-mini="true" required="required"></select>
                     </li>
                     <li>
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                     </li>
                 </ul>
             </form>
diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html
index 9c94c3f77c..b66b13ac08 100644
--- a/dashboard-ui/metadataimages.html
+++ b/dashboard-ui/metadataimages.html
@@ -1,4 +1,4 @@
-<div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="emby-collapsible,scripts/metadataimagespage,paper-checkbox,paper-input,paper-fab,paper-icon-item,paper-item-body,paper-button">
+<div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="emby-collapsible,scripts/metadataimagespage,paper-checkbox,paper-input,paper-fab,paper-icon-item,paper-item-body,emby-button">
 
     <div data-role="content">
 
@@ -63,9 +63,7 @@
                     <br />
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <button type="submit" data-role="none" class="clearButton">
-                                <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                            </button>
+                            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                         </li>
                     </ul>
                 </form>
diff --git a/dashboard-ui/metadatanfo.html b/dashboard-ui/metadatanfo.html
index cba52e027e..466d7d350e 100644
--- a/dashboard-ui/metadatanfo.html
+++ b/dashboard-ui/metadatanfo.html
@@ -1,4 +1,4 @@
-<div id="metadataNfoPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="scripts/metadatanfo,paper-checkbox,paper-button">
+<div id="metadataNfoPage" data-role="page" class="page type-interior metadataConfigurationPage withTabs" data-require="scripts/metadatanfo,paper-checkbox,emby-button">
 
     <div data-role="content">
 
@@ -42,9 +42,7 @@
                 <br />
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                     </li>
                 </ul>
             </form>
diff --git a/dashboard-ui/metadatasubtitles.html b/dashboard-ui/metadatasubtitles.html
index a3370d520b..d7abe7419f 100644
--- a/dashboard-ui/metadatasubtitles.html
+++ b/dashboard-ui/metadatasubtitles.html
@@ -1,4 +1,4 @@
-<div id="metadataSubtitlesPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadatasubtitles,paper-input,paper-checkbox,paper-button">
+<div id="metadataSubtitlesPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadatasubtitles,paper-input,paper-checkbox,emby-button">
 
     <div data-role="content">
 
@@ -45,9 +45,7 @@
                 </ul>
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                     </li>
                 </ul>
             </form>
diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html
index d355dca131..c3ba7af6fa 100644
--- a/dashboard-ui/movies.html
+++ b/dashboard-ui/movies.html
@@ -12,7 +12,7 @@
         <div id="resumableSection" class="homePageSection hide">
             <div>
                 <h1 class="listHeader" style="display:inline-block;vertical-align:middle;">${HeaderResume}</h1>
-                <paper-button raised class="submit mini categorySyncButton" data-category="Resume"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></paper-button>
+                <button is="emby-button" type="button" class="raised submit mini categorySyncButton" data-category="Resume"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></button>
             </div>
 
             <div id="resumableItems" class="itemsContainer noautoinit">
@@ -22,7 +22,7 @@
         <div class="homePageSection">
             <div>
                 <h1 class="listHeader" style="display:inline-block;vertical-align:middle;">${HeaderLatestMovies}</h1>
-                <paper-button raised class="submit mini categorySyncButton" data-category="Latest"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></paper-button>
+                <button is="emby-button" type="button" class="raised submit mini categorySyncButton" data-category="Latest"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></button>
             </div>
 
             <div id="recentlyAddedItems" class="itemsContainer noautoinit">
diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html
index edf94f41d8..36e9034165 100644
--- a/dashboard-ui/mypreferencesdisplay.html
+++ b/dashboard-ui/mypreferencesdisplay.html
@@ -1,4 +1,4 @@
-<div id="displayPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderDisplaySettings}" data-require="scripts/mypreferencesdisplay,paper-checkbox,paper-button,emby-select" data-backbutton="true" data-menubutton="false">
+<div id="displayPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderDisplaySettings}" data-require="scripts/mypreferencesdisplay,paper-checkbox,emby-button,emby-select" data-backbutton="true" data-menubutton="false">
     <div data-role="content">
         <form class="displayPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
             <div class="detailSection languageSection hide">
@@ -97,9 +97,7 @@
                     </div>
                 </div>
             </div>
-            <button type="submit" data-role="none" class="clearButton block btnSave hide">
-                <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-            </button>
+            <button is="emby-button" type="submit" class="raised submit block btnSave hide"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
         </form>
     </div>
 </div>
\ No newline at end of file
diff --git a/dashboard-ui/mypreferenceshome.html b/dashboard-ui/mypreferenceshome.html
index 85bbf9c1ec..0524f0fd10 100644
--- a/dashboard-ui/mypreferenceshome.html
+++ b/dashboard-ui/mypreferenceshome.html
@@ -1,4 +1,4 @@
-<div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeScreenSettings}" data-require="scripts/mypreferenceshome,paper-checkbox,paper-fab,paper-item-body,paper-icon-item,paper-button" data-backbutton="true" data-menubutton="false">
+<div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeScreenSettings}" data-require="scripts/mypreferenceshome,paper-checkbox,paper-fab,paper-item-body,paper-icon-item,emby-button" data-backbutton="true" data-menubutton="false">
 
     <div data-role="content">
         <form class="homeScreenPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
@@ -123,9 +123,7 @@
                 </div>
 
             </div>
-            <button type="submit" data-role="none" class="clearButton block btnSave hide">
-                <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-            </button>
+            <button is="emby-button" type="submit" class="raised submit block btnSave hide"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
         </form>
     </div>
 </div>
\ No newline at end of file
diff --git a/dashboard-ui/mypreferenceslanguages.html b/dashboard-ui/mypreferenceslanguages.html
index 93b89e3ab3..9009bc3783 100644
--- a/dashboard-ui/mypreferenceslanguages.html
+++ b/dashboard-ui/mypreferenceslanguages.html
@@ -1,4 +1,4 @@
-<div id="languagePreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderPlaybackSettings}" data-require="scripts/mypreferenceslanguages,paper-checkbox,paper-button" data-backbutton="true" data-menubutton="false">
+<div id="languagePreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderPlaybackSettings}" data-require="scripts/mypreferenceslanguages,paper-checkbox,emby-button" data-backbutton="true" data-menubutton="false">
 
     <div data-role="content">
 
@@ -89,9 +89,7 @@
                 </div>
             </div>
 
-            <button type="submit" data-role="none" class="clearButton block btnSave hide">
-                <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-            </button>
+            <button is="emby-button" type="submit" class="raised submit block btnSave hide"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
         </form>
     </div>
 </div>
\ No newline at end of file
diff --git a/dashboard-ui/myprofile.html b/dashboard-ui/myprofile.html
index b6d6777053..e8aebb6df6 100644
--- a/dashboard-ui/myprofile.html
+++ b/dashboard-ui/myprofile.html
@@ -1,4 +1,4 @@
-<div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage noSecondaryNavPage" data-title="${HeaderProfile}" data-require="emby-collapsible,scripts/myprofile,paper-checkbox,paper-input,paper-button" data-backbutton="true" data-menubutton="false">
+<div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage noSecondaryNavPage" data-title="${HeaderProfile}" data-require="emby-collapsible,scripts/myprofile,paper-checkbox,paper-input,emby-button" data-backbutton="true" data-menubutton="false">
 
     <div data-role="content">
         <br />
@@ -8,7 +8,7 @@
             <div style="vertical-align:top;margin: .5em 0 0 1em;display:inline-block;">
                 <h2 class="username" style="margin: 0;"></h2>
                 <br />
-                <paper-button raised class="cancel hide" id="btnDeleteImage"><iron-icon icon="delete"></iron-icon><span>${ButtonDeleteImage}</span></paper-button>
+                <button is="emby-button" type="button" class="raised cancel hide" id="btnDeleteImage"><iron-icon icon="delete"></iron-icon><span>${ButtonDeleteImage}</span></button>
             </div>
         </div>
 
@@ -59,11 +59,9 @@
                     </div>
                     <br />
                     <div>
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                         <div id="btnResetPassword" style="display: none;">
-                            <paper-button raised class="cancel block" onclick="UpdatePasswordPage.resetPassword();"><iron-icon icon="lock"></iron-icon><span>${ButtonResetPassword}</span></paper-button>
+                            <button is="emby-button" type="button" class="raised cancel block" onclick="UpdatePasswordPage.resetPassword();"><iron-icon icon="lock"></iron-icon><span>${ButtonResetPassword}</span></button>
                         </div>
                     </div>
                 </div>
@@ -88,10 +86,8 @@
                     </div>
                     <br /><br />
                     <div>
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
-                        <paper-button id="btnResetEasyPassword" raised class="cancel block hide" onclick="UpdatePasswordPage.resetEasyPassword();"><iron-icon icon="lock"></iron-icon><span>${ButtonResetEasyPassword}</span></paper-button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                        <button is="emby-button" type="button" id="btnResetEasyPassword" class="raised cancel block hide" onclick="UpdatePasswordPage.resetEasyPassword();"><iron-icon icon="lock"></iron-icon><span>${ButtonResetEasyPassword}</span></button>
                     </div>
                 </div>
             </div>
diff --git a/dashboard-ui/mysync.html b/dashboard-ui/mysync.html
index 73486bd133..5711e9138c 100644
--- a/dashboard-ui/mysync.html
+++ b/dashboard-ui/mysync.html
@@ -1,16 +1,16 @@
-<div id="mySyncActivityPage" data-role="page" class="page libraryPage syncActivityPage mySyncPage noSecondaryNavPage" data-contextname="${TitleSync}" data-require="scripts/syncactivity,scripts/taskbutton,scripts/mysync,paper-spinner,paper-fab,paper-button">
+<div id="mySyncActivityPage" data-role="page" class="page libraryPage syncActivityPage mySyncPage noSecondaryNavPage" data-contextname="${TitleSync}" data-require="scripts/syncactivity,scripts/taskbutton,scripts/mysync,paper-spinner,paper-fab,emby-button">
 
     <div data-role="content">
 
         <div class="supporterPromotionContainer" style="display:none;text-align: right;">
             <div class="customSupporterPromotion supporterPromotion inlineSupporterPromotion">
-                <paper-button raised class="accent block btnSyncSupporter">
+                <button is="emby-button" type="button" class="raised accent block btnSyncSupporter">
                     <div class="mainText">
                     </div>
                     <div class="btnLearnMore" style="font-weight: normal; margin-top: .25em;">
                         ${ButtonLearnMore}
                     </div>
-                </paper-button>
+                </button>
             </div>
         </div>
         <div class="ehsContent" style="clear:both;">
diff --git a/dashboard-ui/mysyncsettings.html b/dashboard-ui/mysyncsettings.html
index d7ca170dfc..cd9e0aef85 100644
--- a/dashboard-ui/mysyncsettings.html
+++ b/dashboard-ui/mysyncsettings.html
@@ -1,4 +1,4 @@
-<div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-require="scripts/mysyncsettings,paper-checkbox,paper-input,paper-button,paper-icon-button-light" data-backbutton="true" data-menubutton="false">
+<div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-require="scripts/mysyncsettings,paper-checkbox,paper-input,emby-button,paper-icon-button-light" data-backbutton="true" data-menubutton="false">
 
     <div data-role="content">
         <form class="userProfileSettingsForm" style="margin: 0 auto;">
@@ -34,9 +34,7 @@
 
             <br />
             <br />
-            <button type="submit" data-role="none" class="clearButton">
-                <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-            </button>
+            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
         </form>
     </div>
 </div>
\ No newline at end of file
diff --git a/dashboard-ui/notificationsetting.html b/dashboard-ui/notificationsetting.html
index cff8791385..c8ac050407 100644
--- a/dashboard-ui/notificationsetting.html
+++ b/dashboard-ui/notificationsetting.html
@@ -1,4 +1,4 @@
-<div id="notificationSettingPage" data-role="page" class="page type-interior notificationConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Notifications" data-require="scripts/notificationsetting,paper-input,paper-checkbox,paper-button">
+<div id="notificationSettingPage" data-role="page" class="page type-interior notificationConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Notifications" data-require="scripts/notificationsetting,paper-input,paper-checkbox,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -59,11 +59,9 @@
                     </li>
                     <li>
                         <br />
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
 
-                        <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                        <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
                     </li>
 
                 </ul>
diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html
index cc315375e3..9a275010af 100644
--- a/dashboard-ui/nowplaying.html
+++ b/dashboard-ui/nowplaying.html
@@ -99,7 +99,7 @@
                                 <paper-input class="sendMessageElement" type="text" id="txtMessageText" label="${LabelMessageText}" required></paper-input>
                             </div>
                             <p>
-                                <button class="sendMessageElement clearButton" type="submit" data-role="none" style="display:block;"><paper-button class="sendMessageElement accent" type="submit" raised style="display:block;">${ButtonSend}</paper-button></button>
+                                <button is="emby-button" class="sendMessageElement accent" type="submit" raised style="display: block;">${ButtonSend}</button>
                             </p>
                         </form>
                     </div>
@@ -112,7 +112,7 @@
                                 <paper-input class="typeTextElement" type="text" id="txtTypeText" label="${LabelTypeText}" required></paper-input>
                             </div>
                             <p>
-                                <button class="typeTextElement clearButton" type="submit" data-role="none" style="display:block;"><paper-button class="typeTextElement accent" type="submit" raised style="display:block;">${ButtonSend}</paper-button></button>
+                                <button is="emby-button" class="typeTextElement accent" type="submit" raised style="display: block;">${ButtonSend}</button>
                             </p>
                         </form>
                     </div>
diff --git a/dashboard-ui/playbackconfiguration.html b/dashboard-ui/playbackconfiguration.html
index 16f210d4f4..5c396d5247 100644
--- a/dashboard-ui/playbackconfiguration.html
+++ b/dashboard-ui/playbackconfiguration.html
@@ -1,4 +1,4 @@
-<div id="playbackConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-require="scripts/playbackconfiguration,paper-input,paper-button">
+<div id="playbackConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-require="scripts/playbackconfiguration,paper-input,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -29,9 +29,7 @@
                 <br />
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                     </li>
 
                 </ul>
diff --git a/dashboard-ui/scheduledtask.html b/dashboard-ui/scheduledtask.html
index 769f47e478..d742edad5b 100644
--- a/dashboard-ui/scheduledtask.html
+++ b/dashboard-ui/scheduledtask.html
@@ -1,4 +1,4 @@
-<div id="scheduledTaskPage" data-role="page" class="page type-interior scheduledTasksConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Scheduled%20tasks" data-require="jqmpopup,scripts/scheduledtaskpage,paper-input,paper-button">
+<div id="scheduledTaskPage" data-role="page" class="page type-interior scheduledTasksConfigurationPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Scheduled%20tasks" data-require="jqmpopup,scripts/scheduledtaskpage,paper-input,emby-button">
     <div data-role="content">
         <div class="content-primary">
 
@@ -10,10 +10,10 @@
                     <h1 style="margin: .6em 0; vertical-align: middle; display: inline-block;">
                         ${HeaderTaskTriggers}
                     </h1>
-                    <paper-button raised class="btnInvite submit mini" style="margin-left: 1em;" title="${ButtonAddScheduledTaskTrigger}" onclick="ScheduledTaskPage.showAddTriggerPopup();">
+                    <button is="emby-button" type="button" class="raised btnInvite submit mini" style="margin-left: 1em;" title="${ButtonAddScheduledTaskTrigger}" onclick="ScheduledTaskPage.showAddTriggerPopup();">
                         <iron-icon icon="add"></iron-icon>
                         <span>${ButtonAdd}</span>
-                    </paper-button>
+                    </button>
                 </div>
                 <div class="taskTriggers"></div>
             </div>
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index f7b5ab4dad..4ef119925c 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -1326,7 +1326,7 @@
 
                     if (!pluginSecurityInfo.IsMBSupporter && AppInfo.enableSupporterMembership) {
 
-                        var html = '<div class="supporterPromotion"><a class="clearLink" href="http://emby.media/premiere" target="_blank"><paper-button raised class="block" style="text-transform:none;background-color:#52B54B;color:#fff;"><div>' + Globalize.translate('HeaderSupportTheTeam') + '</div><div style="font-weight:normal;margin-top:5px;">' + Globalize.translate('TextEnjoyBonusFeatures') + '</div></paper-button></a></div>';
+                        var html = '<div class="supporterPromotion"><a class="clearLink" href="http://emby.media/premiere" target="_blank"><button is="emby-button" type="button" class="raised block" style="text-transform:none;background-color:#52B54B;color:#fff;"><div>' + Globalize.translate('HeaderSupportTheTeam') + '</div><div style="font-weight:normal;margin-top:5px;">' + Globalize.translate('TextEnjoyBonusFeatures') + '</div></button></a></div>';
 
                         $('.content-primary', page).append(html);
                     }
diff --git a/dashboard-ui/scripts/externalplayer.js b/dashboard-ui/scripts/externalplayer.js
index 46b44339a1..a860bf9019 100644
--- a/dashboard-ui/scripts/externalplayer.js
+++ b/dashboard-ui/scripts/externalplayer.js
@@ -1,4 +1,4 @@
-define(['appSettings', 'datetime', 'jQuery', 'paper-slider', 'paper-button'], function (appSettings, datetime, $) {
+define(['appSettings', 'datetime', 'jQuery', 'paper-slider', 'emby-button'], function (appSettings, datetime, $) {
 
     function getDeviceProfile(serverAddress, deviceId, item, startPositionTicks, maxBitrate, mediaSourceId, audioStreamIndex, subtitleStreamIndex) {
 
@@ -267,7 +267,7 @@
                 html += '<br/>';
             }
 
-            html += '<paper-button class="block submit btnDone" raised>' + Globalize.translate('ButtonImDone') + '</paper-button>';
+            html += '<button is="emby-button" type="button" class="block submit btnDone" raised>' + Globalize.translate('ButtonImDone') + '</button>';
 
             html += '</div>';
 
diff --git a/dashboard-ui/scripts/itembynamedetailpage.js b/dashboard-ui/scripts/itembynamedetailpage.js
index 1afe0d515d..11f033c5d0 100644
--- a/dashboard-ui/scripts/itembynamedetailpage.js
+++ b/dashboard-ui/scripts/itembynamedetailpage.js
@@ -79,7 +79,7 @@
             html += '<h1 class="listHeader" style="display:inline-block;vertical-align:middle;">';
             html += section.name;
             html += '</h1>';
-            html += '<a href="#" class="clearLink hide" style="margin-left:1em;vertical-align:middle;"><paper-button raised class="more mini noIcon">' + Globalize.translate('ButtonMore') + '</paper-button></a>';
+            html += '<a href="#" class="clearLink hide" style="margin-left:1em;vertical-align:middle;"><button is="emby-button" type="button" class="raised more mini noIcon">' + Globalize.translate('ButtonMore') + '</button></a>';
             html += '</div>';
 
             html += '<div class="itemsContainer">';
diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js
index 506e5fdc16..e4fa32531a 100644
--- a/dashboard-ui/scripts/itemdetailpage.js
+++ b/dashboard-ui/scripts/itemdetailpage.js
@@ -1254,7 +1254,7 @@
         }
 
         if (limit && result.TotalRecordCount > limit) {
-            html += '<p style="margin: 0;"><paper-button raised class="more moreCriticReviews">' + Globalize.translate('ButtonMore') + '</paper-button></p>';
+            html += '<p style="margin: 0;"><button is="emby-button" type="button" class="raised more moreCriticReviews">' + Globalize.translate('ButtonMore') + '</button></p>';
         }
 
         var criticReviewsContent = page.querySelector('#criticReviewsContent');
@@ -1434,7 +1434,7 @@
         html += '</div>';
 
         if (limit && chapters.length > limit) {
-            html += '<p style="margin: 0;"><paper-button raised class="more moreScenes">' + Globalize.translate('ButtonMore') + '</paper-button></p>';
+            html += '<p style="margin: 0;"><button is="emby-button" type="button" class="raised more moreScenes">' + Globalize.translate('ButtonMore') + '</button></p>';
         }
 
         var scenesContent = page.querySelector('#scenesContent');
@@ -1677,7 +1677,7 @@
         }
 
         if (limit && items.length > limit) {
-            html += '<p style="margin: 0;padding-left:5px;"><paper-button raised class="more ' + moreButtonClass + '">' + Globalize.translate('ButtonMore') + '</paper-button></p>';
+            html += '<p style="margin: 0;padding-left:5px;"><button is="emby-button" type="button" class="raised more ' + moreButtonClass + '">' + Globalize.translate('ButtonMore') + '</button></p>';
         }
 
         return html;
@@ -1765,7 +1765,7 @@
         }
 
         if (limit && casts.length > limit) {
-            html += '<p style="margin: 0;padding-left:5px;"><paper-button raised class="more morePeople">' + Globalize.translate('ButtonMore') + '</paper-button></p>';
+            html += '<p style="margin: 0;padding-left:5px;"><button is="emby-button" type="button" class="raised more morePeople">' + Globalize.translate('ButtonMore') + '</button></p>';
         }
 
         var castContent = page.querySelector('#castContent');
diff --git a/dashboard-ui/scripts/librarymenu.js b/dashboard-ui/scripts/librarymenu.js
index f4ecc57afe..a99df5d239 100644
--- a/dashboard-ui/scripts/librarymenu.js
+++ b/dashboard-ui/scripts/librarymenu.js
@@ -742,7 +742,7 @@
                 var helpUrl = page.getAttribute('data-helpurl');
 
                 if (helpUrl) {
-                    html += '<a href="' + helpUrl + '" target="_blank" class="clearLink" style="margin-left:2em;" title="' + Globalize.translate('ButtonHelp') + '"><paper-button class="accent" style="margin:0;font-weight:normal;font-size:13px;padding:.25em;display:flex;align-items:center;"><iron-icon icon="info"></iron-icon><span>' + Globalize.translate('ButtonHelp') + '</span></paper-button></a>';
+                    html += '<a href="' + helpUrl + '" target="_blank" class="clearLink" style="margin-left:2em;" title="' + Globalize.translate('ButtonHelp') + '"><button is="emby-button" type="button" class="accent" style="margin:0;font-weight:normal;font-size:13px;padding:.25em;display:flex;align-items:center;"><iron-icon icon="info"></iron-icon><span>' + Globalize.translate('ButtonHelp') + '</span></button></a>';
                 }
             }
 
diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js
index bb9a158feb..3b12ab8ab3 100644
--- a/dashboard-ui/scripts/mediacontroller.js
+++ b/dashboard-ui/scripts/mediacontroller.js
@@ -159,11 +159,11 @@
 
         // On small layouts papepr dialog doesn't respond very well. this button isn't that important here anyway.
         if (screen.availWidth >= 600) {
-            html += '<paper-button class="btnRemoteControl">' + Globalize.translate('ButtonRemoteControl') + '</paper-button>';
+            html += '<button is="emby-button" type="button" class="btnRemoteControl">' + Globalize.translate('ButtonRemoteControl') + '</button>';
         }
 
-        html += '<paper-button class="btnDisconnect">' + Globalize.translate('ButtonDisconnect') + '</paper-button>';
-        html += '<paper-button class="btnCancel">' + Globalize.translate('ButtonCancel') + '</paper-button>';
+        html += '<button is="emby-button" type="button" class="btnDisconnect">' + Globalize.translate('ButtonDisconnect') + '</button>';
+        html += '<button is="emby-button" type="button" class="btnCancel">' + Globalize.translate('ButtonCancel') + '</button>';
         html += '</div>';
 
         dlg.innerHTML = html;
diff --git a/dashboard-ui/scripts/registrationservices.js b/dashboard-ui/scripts/registrationservices.js
index 5308a1226a..07f9e4fc46 100644
--- a/dashboard-ui/scripts/registrationservices.js
+++ b/dashboard-ui/scripts/registrationservices.js
@@ -90,7 +90,7 @@
 
     function showPlaybackOverlay(resolve, reject) {
 
-        require(['dialogHelper', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'paper-button'], function (dialogHelper) {
+        require(['dialogHelper', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'emby-button'], function (dialogHelper) {
 
             var dlg = dialogHelper.createDialog({
                 size: 'fullscreen-border'
@@ -122,8 +122,8 @@
 
             html += '<br/>';
 
-            html += '<a class="clearLink" href="http://emby.media/premiere" target="_blank"><paper-button raised class="submit block" autoFocus><iron-icon icon="check"></iron-icon><span>' + Globalize.translate('ButtonBecomeSupporter') + '</span></paper-button></a>';
-            html += '<paper-button raised class="subdued block btnCancelSupporterInfo" style="background:#444;"><iron-icon icon="close"></iron-icon><span>' + Globalize.translate('ButtonClosePlayVideo') + '</span></paper-button>';
+            html += '<a class="clearLink" href="http://emby.media/premiere" target="_blank"><button is="emby-button" type="button" class="raised submit block" autoFocus><iron-icon icon="check"></iron-icon><span>' + Globalize.translate('ButtonBecomeSupporter') + '</span></button></a>';
+            html += '<button is="emby-button" type="button" class="raised subdued block btnCancelSupporterInfo" style="background:#444;"><iron-icon icon="close"></iron-icon><span>' + Globalize.translate('ButtonClosePlayVideo') + '</span></button>';
 
             html += '</div>';
 
diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js
index 440083bdee..9ba8cbfe0f 100644
--- a/dashboard-ui/scripts/sections.js
+++ b/dashboard-ui/scripts/sections.js
@@ -1,4 +1,4 @@
-define(['libraryBrowser', 'appSettings', 'scrollStyles', 'paper-button', 'paper-icon-button-light'], function (LibraryBrowser, appSettings) {
+define(['libraryBrowser', 'appSettings', 'scrollStyles', 'emby-button', 'paper-icon-button-light'], function (LibraryBrowser, appSettings) {
 
     function getUserViews(userId) {
 
@@ -622,7 +622,7 @@
                 html += '<div>';
                 var text = Globalize.translate('HeaderLatestFromChannel').replace('{0}', channel.Name);
                 html += '<h1 style="display:inline-block; vertical-align:middle;" class="listHeader">' + text + '</h1>';
-                html += '<a href="channelitems.html?id=' + channel.Id + '" class="clearLink" style="margin-left:2em;"><paper-button raised class="more mini"><span>' + Globalize.translate('ButtonMore') + '</span></paper-button></a>';
+                html += '<a href="channelitems.html?id=' + channel.Id + '" class="clearLink" style="margin-left:2em;"><button is="emby-button" type="button" class="raised more mini"><span>' + Globalize.translate('ButtonMore') + '</span></button></a>';
                 html += '</div>';
 
                 html += '<div class="itemsContainer">';
@@ -667,7 +667,7 @@
 
                 html += '<div>';
                 html += '<h1 style="display:inline-block; vertical-align:middle;" class="' + cssClass + '">' + Globalize.translate('HeaderLatestTvRecordings') + '</h1>';
-                html += '<a href="livetv.html?tab=3" onclick="LibraryBrowser.showTab(\'livetv.html\',3);" class="clearLink" style="margin-left:2em;"><paper-button raised class="more mini"><span>' + Globalize.translate('ButtonMore') + '</span></paper-button></a>';
+                html += '<a href="livetv.html?tab=3" onclick="LibraryBrowser.showTab(\'livetv.html\',3);" class="clearLink" style="margin-left:2em;"><button is="emby-button" type="button" class="raised more mini"><span>' + Globalize.translate('ButtonMore') + '</span></button></a>';
                 html += '</div>';
             }
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index cf00b88131..5b41f2f9cd 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -255,7 +255,7 @@ var Dashboard = {
         var html = '<span style="margin-right: 1em;">' + Globalize.translate('MessagePleaseRestart') + '</span>';
 
         if (systemInfo.CanSelfRestart) {
-            html += '<paper-button raised class="submit mini" onclick="this.disabled=\'disabled\';Dashboard.restartServer();"><iron-icon icon="refresh"></iron-icon><span>' + Globalize.translate('ButtonRestart') + '</span></paper-button>';
+            html += '<button is="emby-button" type="button" class="raised submit mini" onclick="this.disabled=\'disabled\';Dashboard.restartServer();"><iron-icon icon="refresh"></iron-icon><span>' + Globalize.translate('ButtonRestart') + '</span></button>';
         }
 
         Dashboard.showFooterNotification({ id: "serverRestartWarning", html: html, forceShow: true, allowHide: false });
@@ -277,7 +277,7 @@ var Dashboard = {
 
         var html = '<span style="margin-right: 1em;">' + Globalize.translate('MessagePleaseRefreshPage') + '</span>';
 
-        html += '<paper-button raised class="submit mini" onclick="this.disabled=\'disabled\';Dashboard.reloadPage();"><iron-icon icon="refresh"></iron-icon><span>' + Globalize.translate('ButtonRefresh') + '</span></paper-button>';
+        html += '<button is="emby-button" type="button" class="raised submit mini" onclick="this.disabled=\'disabled\';Dashboard.reloadPage();"><iron-icon icon="refresh"></iron-icon><span>' + Globalize.translate('ButtonRefresh') + '</span></button>';
 
         Dashboard.showFooterNotification({ id: "dashboardVersionWarning", html: html, forceShow: true, allowHide: false });
     },
@@ -327,7 +327,7 @@ var Dashboard = {
         var onclick = removeOnHide ? "jQuery(\"#" + options.id + "\").trigger(\"notification.remove\").remove();" : "jQuery(\"#" + options.id + "\").trigger(\"notification.hide\").hide();";
 
         if (options.allowHide !== false) {
-            options.html += '<span style="margin-left: 1em;"><paper-button class="submit" onclick="' + onclick + '">' + Globalize.translate('ButtonHide') + "</paper-button></span>";
+            options.html += '<span style="margin-left: 1em;"><button is="emby-button" type="button" class="submit" onclick="' + onclick + '">' + Globalize.translate('ButtonHide') + "</button></span>";
         }
 
         if (options.forceShow) {
@@ -1004,7 +1004,7 @@ var Dashboard = {
             html += '</progress>';
 
             if (percentComplete < 100) {
-                html += '<paper-button raised class="cancelDark mini" onclick="this.disabled=\'disabled\';Dashboard.cancelInstallation(\'' + installation.Id + '\');"><iron-icon icon="cancel"></iron-icon><span>' + Globalize.translate('ButtonCancel') + '</span></paper-button>';
+                html += '<button is="emby-button" type="button" class="raised cancelDark mini" onclick="this.disabled=\'disabled\';Dashboard.cancelInstallation(\'' + installation.Id + '\');"><iron-icon icon="cancel"></iron-icon><span>' + Globalize.translate('ButtonCancel') + '</span></button>';
             }
         }
 
@@ -1887,7 +1887,7 @@ var AppInfo = {};
         define("paper-item-body", ["html!" + bowerPath + "/paper-item/paper-item-body.html"]);
 
         define("paper-collapse-item", ["html!" + bowerPath + "/paper-collapse-item/paper-collapse-item.html"]);
-        define("emby-collapsible", ["html!" + bowerPath + "/emby-collapsible/emby-collapsible.html"]);
+        define("emby-collapsible", ["emby-button", "html!" + bowerPath + "/emby-collapsible/emby-collapsible.html"]);
 
         define("jstree", [bowerPath + "/jstree/dist/jstree", "css!thirdparty/jstree/themes/default/style.min.css"]);
 
@@ -2392,7 +2392,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/connectlogin.html',
-            dependencies: ['paper-button'],
+            dependencies: ['emby-button'],
             autoFocus: false,
             anonymous: true
         });
@@ -2414,7 +2414,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/dashboardhosting.html',
-            dependencies: ['paper-checkbox', 'paper-input', 'paper-button'],
+            dependencies: ['paper-checkbox', 'paper-input', 'emby-button'],
             autoFocus: false,
             roles: 'admin',
             controller: 'scripts/dashboardhosting'
@@ -2549,7 +2549,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/itemdetails.html',
-            dependencies: ['paper-button', 'tileitemcss', 'scripts/livetvcomponents', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'paper-icon-button-light'],
+            dependencies: ['emby-button', 'tileitemcss', 'scripts/livetvcomponents', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'paper-icon-button-light'],
             controller: 'scripts/itemdetailpage',
             autoFocus: false,
             transition: 'fade'
@@ -2578,7 +2578,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/librarydisplay.html',
-            dependencies: ['paper-button', 'paper-checkbox'],
+            dependencies: ['emby-button', 'paper-checkbox'],
             autoFocus: false,
             roles: 'admin',
             controller: 'scripts/librarydisplay'
@@ -2593,7 +2593,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/librarysettings.html',
-            dependencies: ['emby-collapsible', 'paper-input', 'paper-checkbox', 'paper-button'],
+            dependencies: ['emby-collapsible', 'paper-input', 'paper-checkbox', 'emby-button'],
             autoFocus: false,
             roles: 'admin',
             controller: 'scripts/librarysettings'
@@ -2601,7 +2601,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/livetv.html',
-            dependencies: ['paper-button', 'livetvcss'],
+            dependencies: ['emby-button', 'livetvcss'],
             controller: 'scripts/livetvsuggested',
             autoFocus: false,
             transition: 'fade'
@@ -2676,7 +2676,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/login.html',
-            dependencies: ['paper-button', 'humanedate', 'emby-input'],
+            dependencies: ['emby-button', 'humanedate', 'emby-input'],
             autoFocus: false,
             anonymous: true,
             controller: 'scripts/loginpage'
@@ -2719,7 +2719,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/movies.html',
-            dependencies: ['paper-checkbox', 'scripts/alphapicker', 'paper-button'],
+            dependencies: ['paper-checkbox', 'scripts/alphapicker', 'emby-button'],
             autoFocus: false,
             controller: 'scripts/moviesrecommended',
             transition: 'fade'
@@ -2735,35 +2735,35 @@ var AppInfo = {};
 
         defineRoute({
             path: '/mypreferencesdisplay.html',
-            dependencies: ['paper-button'],
+            dependencies: ['emby-button'],
             autoFocus: false,
             transition: 'fade'
         });
 
         defineRoute({
             path: '/mypreferenceshome.html',
-            dependencies: ['paper-button'],
+            dependencies: ['emby-button'],
             autoFocus: false,
             transition: 'fade'
         });
 
         defineRoute({
             path: '/mypreferenceslanguages.html',
-            dependencies: ['paper-button'],
+            dependencies: ['emby-button'],
             autoFocus: false,
             transition: 'fade'
         });
 
         defineRoute({
             path: '/mypreferencesmenu.html',
-            dependencies: ['paper-button'],
+            dependencies: ['emby-button'],
             autoFocus: false,
             transition: 'fade'
         });
 
         defineRoute({
             path: '/myprofile.html',
-            dependencies: ['paper-button'],
+            dependencies: ['emby-button'],
             autoFocus: false,
             transition: 'fade'
         });
@@ -2812,7 +2812,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/nowplaying.html',
-            dependencies: ['paper-icon-button-light', 'paper-slider', 'paper-button'],
+            dependencies: ['paper-icon-button-light', 'paper-slider', 'emby-button'],
             controller: 'scripts/nowplayingpage',
             autoFocus: false,
             transition: 'fade'
@@ -2948,7 +2948,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/tv.html',
-            dependencies: ['paper-checkbox', 'paper-icon-button-light', 'paper-button'],
+            dependencies: ['paper-checkbox', 'paper-icon-button-light', 'emby-button'],
             autoFocus: false,
             controller: 'scripts/tvrecommended',
             transition: 'fade'
@@ -3004,7 +3004,7 @@ var AppInfo = {};
 
         defineRoute({
             path: '/wizardfinish.html',
-            dependencies: ['paper-button', 'dashboardcss'],
+            dependencies: ['emby-button', 'dashboardcss'],
             autoFocus: false,
             anonymous: true,
             controller: 'scripts/wizardfinishpage'
diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js
index e1b18383df..dac9168f97 100644
--- a/dashboard-ui/scripts/sync.js
+++ b/dashboard-ui/scripts/sync.js
@@ -255,7 +255,7 @@
                 html += Globalize.translate('SyncMedia');
                 html += '</div>';
 
-                html += '<a href="https://github.com/MediaBrowser/Wiki/wiki/Sync" target="_blank" class="clearLink" style="margin-top:0;display:inline-block;vertical-align:middle;margin-left:auto;"><paper-button class="mini"><iron-icon icon="info"></iron-icon><span>' + Globalize.translate('ButtonHelp') + '</span></paper-button></a>';
+                html += '<a href="https://github.com/MediaBrowser/Wiki/wiki/Sync" target="_blank" class="clearLink" style="margin-top:0;display:inline-block;vertical-align:middle;margin-left:auto;"><button is="emby-button" type="button" class="mini"><iron-icon icon="info"></iron-icon><span>' + Globalize.translate('ButtonHelp') + '</span></button></a>';
 
                 html += '</div>';
 
@@ -264,7 +264,7 @@
                 html += '<div class="formFields"></div>';
 
                 html += '<p>';
-                html += '<button type="submit" data-role="none" class="clearButton"><paper-button raised class="submit block"><iron-icon icon="sync"></iron-icon><span>' + Globalize.translate('ButtonSync') + '</span></paper-button></button>';
+                html += '<button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="sync"></iron-icon><span>' + Globalize.translate('ButtonSync') + '</span></button>';
                 html += '</p>';
 
                 html += '</form>';
diff --git a/dashboard-ui/scripts/syncjob.js b/dashboard-ui/scripts/syncjob.js
index eebc3def41..aca4ad5035 100644
--- a/dashboard-ui/scripts/syncjob.js
+++ b/dashboard-ui/scripts/syncjob.js
@@ -1,4 +1,4 @@
-define(['jQuery', 'datetime', 'paper-progress', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'paper-icon-button-light', 'paper-button'], function ($, datetime) {
+define(['jQuery', 'datetime', 'paper-progress', 'paper-fab', 'paper-item-body', 'paper-icon-item', 'paper-icon-button-light', 'emby-button'], function ($, datetime) {
 
     function renderJob(page, job, dialogOptions) {
 
@@ -12,9 +12,7 @@
 
         html += '<br/>';
         html += '<br/>';
-        html += '<button type="submit" data-role="none" class="clearButton">';
-        html += '<paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>' + Globalize.translate('ButtonSave') + '</span></paper-button>';
-        html += '</button>';
+        html += '<button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>' + Globalize.translate('ButtonSave') + '</span></button>';
 
         $('.syncJobForm', page).html(html);
 
diff --git a/dashboard-ui/scripts/taskbutton.js b/dashboard-ui/scripts/taskbutton.js
index a12abbd186..60a91943ea 100644
--- a/dashboard-ui/scripts/taskbutton.js
+++ b/dashboard-ui/scripts/taskbutton.js
@@ -1,4 +1,4 @@
-define(['appStorage', 'jQuery', 'paper-button'], function (appStorage, $) {
+define(['appStorage', 'jQuery', 'emby-button'], function (appStorage, $) {
 
     $.fn.taskButton = function (options) {
 
@@ -94,7 +94,7 @@
                 var msg = Globalize.translate('ConfirmMessageScheduledTaskButton');
                 msg += '<br/>';
                 msg += '<div style="margin-top:1em;">';
-                msg += '<a class="clearLink" href="scheduledtasks.html"><paper-button style="color:#3f51b5!important;margin:0;">' + Globalize.translate('ButtonScheduledTasks') + '</paper-button></a>';
+                msg += '<a class="clearLink" href="scheduledtasks.html"><button is="emby-button" type="button" style="color:#3f51b5!important;margin:0;">' + Globalize.translate('ButtonScheduledTasks') + '</button></a>';
                 msg += '</div>';
 
                 require(['confirm'], function (confirm) {
diff --git a/dashboard-ui/selectserver.html b/dashboard-ui/selectserver.html
index eeee68fdba..64e7ed6f58 100644
--- a/dashboard-ui/selectserver.html
+++ b/dashboard-ui/selectserver.html
@@ -1,4 +1,4 @@
-<div id="selectServerPage" data-role="page" class="page noSecondaryNavPage standalonePage" data-theme="b" data-require="scripts/selectserver,paper-fab,paper-item-body,paper-icon-item,paper-button">
+<div id="selectServerPage" data-role="page" class="page noSecondaryNavPage standalonePage" data-theme="b" data-require="scripts/selectserver,paper-fab,paper-item-body,paper-icon-item,emby-button">
 
     <div data-role="content">
 
@@ -6,7 +6,7 @@
 
             <div style="margin:1em 0 .5em;padding-left:5px;">
                 <h1 style="display:inline-block;vertical-align:middle;margin: 0;">${HeaderSelectServer}</h1>
-                <a href="https://github.com/MediaBrowser/Wiki/wiki/Emby%20Connect" target="_blank" class="clearLink" style="margin-top:0;display:inline-block;vertical-align:middle;margin-left:1em;"><paper-button raised class="secondary mini"><iron-icon icon="info"></iron-icon><span>${ButtonHelp}</span></paper-button></a>
+                <a href="https://github.com/MediaBrowser/Wiki/wiki/Emby%20Connect" target="_blank" class="clearLink" style="margin-top:0;display:inline-block;vertical-align:middle;margin-left:1em;"><button is="emby-button" type="button" class="raised secondary mini"><iron-icon icon="info"></iron-icon><span>${ButtonHelp}</span></button></a>
             </div>
 
             <div class="serverList paperList"></div>
@@ -17,11 +17,11 @@
             </div>
 
             <div class="addServer" style="margin:0 0 1em;">
-                <a href="connectlogin.html?mode=manualserver" class="clearLink"><paper-button raised class="cancel block"><iron-icon icon="add"></iron-icon><span>${ButtonAddServer}</span></paper-button></a>
+                <a href="connectlogin.html?mode=manualserver" class="clearLink"><button is="emby-button" type="button" class="raised cancel block"><iron-icon icon="add"></iron-icon><span>${ButtonAddServer}</span></button></a>
             </div>
 
             <div class="connectLogin" style="margin:1em 0;display:none;">
-                <a href="connectlogin.html?mode=connect" class="clearLink"><paper-button raised class="accent block"><iron-icon icon="check"></iron-icon><span>${ButtonSignInWithConnect}</span></paper-button></a>
+                <a href="connectlogin.html?mode=connect" class="clearLink"><button is="emby-button" type="button" class="raised accent block"><iron-icon icon="check"></iron-icon><span>${ButtonSignInWithConnect}</span></button></a>
             </div>
 
             <div class="invitationSection" style="display:none;">
diff --git a/dashboard-ui/serversecurity.html b/dashboard-ui/serversecurity.html
index c9e67a85c0..fad23e6c04 100644
--- a/dashboard-ui/serversecurity.html
+++ b/dashboard-ui/serversecurity.html
@@ -1,14 +1,14 @@
-<div id="serverSecurityPage" data-role="page" class="page type-interior advancedConfigurationPage withTabs" data-require="jqmtable,scripts/serversecurity,detailtablecss,paper-button">
+<div id="serverSecurityPage" data-role="page" class="page type-interior advancedConfigurationPage withTabs" data-require="jqmtable,scripts/serversecurity,detailtablecss,emby-button">
     <div data-role="content">
         <div class="content-primary">
             <div class="detailSectionHeader">
                 <h3 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
                     ${HeaderApiKeys}
                 </h3>
-                <paper-button raised class="btnNewKey submit mini" style="margin-left:1em;" title="${ButtonNew}">
+                <button is="emby-button" type="button" class="raised btnNewKey submit mini" style="margin-left:1em;" title="${ButtonNew}">
                     <iron-icon icon="add"></iron-icon>
                     <span>${ButtonAdd}</span>
-                </paper-button>
+                </button>
             </div>
             <p>${HeaderApiKeysHelp}</p>
             <br />
diff --git a/dashboard-ui/streamingsettings.html b/dashboard-ui/streamingsettings.html
index 4409dc5295..70e3265ee9 100644
--- a/dashboard-ui/streamingsettings.html
+++ b/dashboard-ui/streamingsettings.html
@@ -1,4 +1,4 @@
-<div id="streamingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Streaming" data-require="scripts/streamingsettings,paper-input,paper-button">
+<div id="streamingSettingsPage" data-role="page" class="page type-interior playbackConfigurationPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Streaming" data-require="scripts/streamingsettings,paper-input,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -11,7 +11,7 @@
                         <div class="fieldDescription">${LabelRemoteClientBitrateLimitHelp}</div>
                     </li>
                     <li>
-                        <br/>
+                        <br />
                         <label for="selectChannelResolution" class="selectLabel">${LabelChannelStreamQuality}</label>
                         <select id="selectChannelResolution" data-mini="true">
                             <option value="">${OptionBestAvailableStreamQuality}</option>
@@ -22,10 +22,7 @@
                         <div class="fieldDescription">${LabelChannelStreamQualityHelp}</div>
                     </li>
                 </ul>
-
-                <button type="submit" data-role="none" class="clearButton">
-                    <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                </button>
+                <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
             </form>
         </div>
     </div>
diff --git a/dashboard-ui/supporterkey.html b/dashboard-ui/supporterkey.html
index ff6c81d254..ed7f348623 100644
--- a/dashboard-ui/supporterkey.html
+++ b/dashboard-ui/supporterkey.html
@@ -1,4 +1,4 @@
-<div id="supporterKeyPage" data-role="page" class="page type-interior withTabs" data-require="jqmcollapsible,scripts/supporterkeypage,emby-input,paper-button">
+<div id="supporterKeyPage" data-role="page" class="page type-interior withTabs" data-require="jqmcollapsible,scripts/supporterkeypage,emby-input,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -13,7 +13,7 @@
                     <div class="supporterContainer hide">
                         <br />
                         <a class="clearLink" href="http://emby.media/premiere" target="_blank">
-                            <paper-button raised class="block accent"><iron-icon icon="check"></iron-icon><span>${HeaderBecomeProjectSupporter}</span></paper-button>
+                            <button is="emby-button" type="button" class="raised block accent"><iron-icon icon="check"></iron-icon><span>${HeaderBecomeProjectSupporter}</span></button>
                         </a>
                     </div>
                 </div>
@@ -27,7 +27,7 @@
 
                         <h1>${TabSupporterKey}</h1>
                         <div class="inputContainer">
-                            <input is="emby-input" type="password" id="txtSupporterKey" label="${LabelSupporterKey}" autocomplete="off"/>
+                            <input is="emby-input" type="password" id="txtSupporterKey" label="${LabelSupporterKey}" autocomplete="off" />
                             <div class="fieldDescription">
                                 ${LabelSupporterKeyHelp}
                             </div>
@@ -44,9 +44,7 @@
 
                     </div>
                     <p>
-                        <button type="submit" id="mbLegacyKeyBtn" class="clearButton">
-                            <paper-button raised class="block submit"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" id="mbLegacyKeyBtn" class="raised block submit"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                     </p>
                 </form>
                 <br />
@@ -55,13 +53,11 @@
                     <div>
                         <form id="lostKeyForm">
                             <div style="margin: 1em 0;" class="inputContainer">
-                                <input is="emby-input" type="email" required id="txtEmail" label="${LabelEmailAddress}"/>
+                                <input is="emby-input" type="email" required id="txtEmail" label="${LabelEmailAddress}" />
                                 <div class="fieldDescription">${LabelSupporterEmailAddress}</div>
                             </div>
                             <p>
-                                <button type="submit" id="mbRetrieveKeyBtn" class="clearButton">
-                                    <paper-button raised class="block submit"><iron-icon icon="check"></iron-icon><span>${ButtonRetrieveKey}</span></paper-button>
-                                </button>
+                                <button is="emby-button" type="submit" id="mbRetrieveKeyBtn" class="raised block submit"><iron-icon icon="check"></iron-icon><span>${ButtonRetrieveKey}</span></button>
                             </p>
                         </form>
                     </div>
@@ -76,7 +72,7 @@
                                 ${MultipleKeyLinkingHelp}
                             </p>
                             <div style="margin: 1em 0;" class="inputContainer">
-                                <input is="emby-input" type="email" required id="txtNewEmail" label="${LabelCurrentEmailAddress}"/>
+                                <input is="emby-input" type="email" required id="txtNewEmail" label="${LabelCurrentEmailAddress}" />
                                 <div class="fieldDescription">
                                     ${LabelCurrentEmailAddressHelp}
                                 </div>
@@ -85,12 +81,10 @@
                                 <input is="emby-input" type="password" required id="txtNewKey" label="${LabelNewSupporterKey}" />
                             </div>
                             <div class="inputContainer">
-                                <input is="emby-input" type="password" required id="txtOldKey" label="${LabelOldSupporterKey}"/>
+                                <input is="emby-input" type="password" required id="txtOldKey" label="${LabelOldSupporterKey}" />
                             </div>
                             <p>
-                                <button type="submit" id="mbLinkKeysBtn" class="clearButton">
-                                    <paper-button raised class="block submit"><iron-icon icon="check"></iron-icon><span>${ButtonLinkKeys}</span></paper-button>
-                                </button>
+                                <button is="emby-button" type="submit" id="mbLinkKeysBtn" class="raised block submit"><iron-icon icon="check"></iron-icon><span>${ButtonLinkKeys}</span></button>
                             </p>
                         </form>
                     </div>
diff --git a/dashboard-ui/syncactivity.html b/dashboard-ui/syncactivity.html
index 6405bc9b89..84200c2477 100644
--- a/dashboard-ui/syncactivity.html
+++ b/dashboard-ui/syncactivity.html
@@ -1,23 +1,23 @@
-<div id="syncActivityPage" data-role="page" class="page type-interior syncConfigurationPage syncActivityPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="scripts/syncactivity,scripts/taskbutton,paper-button">
+<div id="syncActivityPage" data-role="page" class="page type-interior syncConfigurationPage syncActivityPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="scripts/syncactivity,scripts/taskbutton,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
 
             <div style="text-align:right;margin-top:-10px;">
-                <paper-button raised class="btnSync"><iron-icon icon="sync"></iron-icon><span>${ButtonConvertMedia}</span></paper-button>
+                <button is="emby-button" type="button" class="raised btnSync"><iron-icon icon="sync"></iron-icon><span>${ButtonConvertMedia}</span></button>
                 <progress max="100" min="0" style="width:100px;display:none;" class="syncProgress"></progress>
             </div>
             <br />
             <div class="supporterPromotionContainer" style="display:none;">
                 <div class="customSupporterPromotion supporterPromotion">
                     <a class="clearLink" href="http://emby.media/premiere" target="_blank">
-                        <paper-button raised class="block" style="text-transform:none;background-color:#52B54B;color:#fff;">
+                        <button is="emby-button" type="button" class="raised block" style="text-transform:none;background-color:#52B54B;color:#fff;">
                             <div class="mainText">
                             </div>
                             <div class="btnLearnMore" style="font-weight: normal; margin-top: 5px;">
                                 ${ButtonLearnMore}
                             </div>
-                        </paper-button>
+                        </button>
                     </a>
                 </div>
             </div>
diff --git a/dashboard-ui/syncsettings.html b/dashboard-ui/syncsettings.html
index 53c7586eb1..306430a528 100644
--- a/dashboard-ui/syncsettings.html
+++ b/dashboard-ui/syncsettings.html
@@ -1,4 +1,4 @@
-<div id="syncSettingsPage" data-role="page" class="page type-interior withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="scripts/syncsettings,paper-checkbox,paper-input,paper-button,paper-icon-button-light">
+<div id="syncSettingsPage" data-role="page" class="page type-interior withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="scripts/syncsettings,paper-checkbox,paper-input,emby-button,paper-icon-button-light">
 
     <div data-role="content">
         <div class="content-primary">
@@ -32,11 +32,9 @@
 
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
 
-                        <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                        <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
                     </li>
                 </ul>
             </form>
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index 92dff1b2c6..90e5ae37b5 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -1,135 +1,4 @@
-paper-button, .paper-button-0 {
-    font-weight: 500;
-    vertical-align: middle;
-    margin-top: 5px;
-    margin-bottom: 5px;
-}
-
-    paper-button.block {
-        display: block;
-        margin: .25em 0;
-    }
-
-    paper-button.blue {
-        color: #03a9f4;
-    }
-
-        paper-button.blue:hover {
-            background: #e1f5f3;
-        }
-
-    paper-button.menuButton {
-        color: #212121;
-        text-align: left;
-    }
-
-        paper-button.menuButton:hover {
-            background: #e1f5f3;
-        }
-
-    paper-button.ripple::shadow paper-ripple {
-        color: #ff3bee;
-    }
-
-    paper-button.ripple paper-ripple {
-        color: #ff3bee;
-    }
-
-    paper-button.submit {
-        color: #52B54B;
-    }
-
-    paper-button[raised].submit, paper-button[raised]:not(.subdued):not(.cancel) {
-        background: #52B54B;
-        color: #fff;
-    }
-
-    paper-button.more {
-        color: #EC407A;
-    }
-
-    paper-button[raised].more {
-        background: #EC407A;
-        color: #fff;
-    }
-
-    paper-button.secondary {
-        color: #4285f4;
-    }
-
-    paper-button[raised].secondary {
-        background: #4285f4;
-        color: #fff;
-    }
-
-    paper-button.accent {
-        color: #52B54B;
-    }
-
-    paper-button[raised].accent {
-        background: #52B54B;
-        color: #fff;
-    }
-
-    paper-button.alt {
-        color: #F57F17;
-    }
-
-    paper-button[raised].alt {
-        background: #F57F17;
-        color: #fff;
-    }
-
-.ui-body-b paper-button.cancel {
-    color: #444;
-}
-
-.ui-body-b paper-button[raised].cancel {
-    background: #444;
-    color: #fff;
-}
-
-paper-button.cancelDark {
-    color: #444;
-}
-
-paper-button[raised].cancelDark {
-    background: #444;
-    color: #fff;
-}
-
-.ui-body-b paper-button.subdued:not([disabled]) {
-    color: #404040;
-}
-
-.ui-body-b paper-button[raised].subdued:not([disabled]) {
-    background: #404040;
-    color: #fff;
-}
-
-.ui-body-b paper-button[raised][disabled].subduedd {
-    background: #111;
-}
-
-paper-button.hover:hover {
-    background: #eee;
-}
-
-paper-button span {
-    vertical-align: middle;
-}
-
-paper-button:not(.iconRight) > iron-icon {
-    margin-right: .5em;
-}
-
-paper-button.iconRight iron-icon {
-    position: absolute;
-    right: 5px;
-    top: 5px;
-}
-
-button[is="emby-button"].blue {
+button[is="emby-button"].blue {
     color: #03a9f4;
 }
 
@@ -227,10 +96,6 @@ button[is="emby-button"] span {
     vertical-align: middle;
 }
 
-button[is="emby-button"]:not(.iconRight) > iron-icon {
-    margin-right: .5em;
-}
-
 button[is="emby-button"].iconRight iron-icon {
     position: absolute;
     right: 5px;
@@ -274,40 +139,10 @@ button[is="emby-button"].mini {
         width: 20px;
     }
 
-paper-button.mini {
-    min-width: initial;
-}
-
-paper-button.mini {
-    padding: 0.4em 0.7em;
-}
-
-    paper-button.mini.noIcon {
-        padding: 0.4em 0.7em;
-    }
-
-    paper-button.mini iron-icon {
-        height: 20px;
-        width: 20px;
-    }
-
 paper-toast {
     z-index: 9999999;
 }
 
-paper-button.notext {
-    min-width: 2.8em;
-}
-
-    paper-button.notext .content {
-        padding-left: 0 !important;
-        padding-right: 0 !important;
-    }
-
-    paper-button.notext iron-icon {
-        margin-right: 0;
-    }
-
 button[is="emby-button"].notext {
     min-width: 2.8em;
 }
@@ -635,7 +470,7 @@ div.dialogHeader {
     margin-top: .7em;
 }
 
-.dialogHeader paper-button, .dialogHeader button {
+.dialogHeader button {
     margin-top: 0;
     margin-bottom: 0;
 }
diff --git a/dashboard-ui/tv.html b/dashboard-ui/tv.html
index 35581be1fc..26e96d5407 100644
--- a/dashboard-ui/tv.html
+++ b/dashboard-ui/tv.html
@@ -13,7 +13,7 @@
         <div id="resumableSection" class="homePageSection">
             <div>
                 <h1 class="listHeader" style="display: inline-block; vertical-align: middle;">${HeaderResume}</h1>
-                <paper-button raised class="submit mini categorySyncButton" data-category="Resume"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></paper-button>
+                <button is="emby-button" type="button" class="raised submit mini categorySyncButton" data-category="Resume"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></button>
             </div>
 
             <div id="resumableItems" class="itemsContainer noautoinit">
@@ -23,7 +23,7 @@
         <div class="homePageSection">
             <div>
                 <h1 class="listHeader nextUpHeader" style="display: inline-block; vertical-align: middle;">${HeaderNextUp}</h1>
-                <paper-button raised class="submit mini categorySyncButton" data-category="NextUp"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></paper-button>
+                <button is="emby-button" type="button" class="raised submit mini categorySyncButton" data-category="NextUp"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></button>
             </div>
             <div id="nextUpItems" class="itemsContainer">
             </div>
@@ -34,7 +34,7 @@
         <div class="homePageSection">
             <div>
                 <h1 class="listHeader" style="display: inline-block; vertical-align: middle;">${HeaderLatestEpisodes}</h1>
-                <paper-button raised class="submit mini categorySyncButton" data-category="Latest"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></paper-button>
+                <button is="emby-button" type="button" class="raised submit mini categorySyncButton" data-category="Latest"><iron-icon icon="sync"></iron-icon><span>${ButtonSync}</span></button>
             </div>
             <div id="latestEpisodes" class="itemsContainer">
             </div>
diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html
index 4c2c57342f..4e76359c23 100644
--- a/dashboard-ui/useredit.html
+++ b/dashboard-ui/useredit.html
@@ -1,4 +1,4 @@
-<div id="editUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/useredit,paper-input,paper-checkbox,paper-button">
+<div id="editUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/useredit,paper-input,paper-checkbox,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -105,11 +105,9 @@
                 <br />
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
 
-                        <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                        <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
                     </li>
                 </ul>
             </form>
diff --git a/dashboard-ui/userlibraryaccess.html b/dashboard-ui/userlibraryaccess.html
index 84bfd7496b..beca75d201 100644
--- a/dashboard-ui/userlibraryaccess.html
+++ b/dashboard-ui/userlibraryaccess.html
@@ -1,4 +1,4 @@
-<div id="userLibraryAccessPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/userlibraryaccess,paper-checkbox,paper-button">
+<div id="userLibraryAccessPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/userlibraryaccess,paper-checkbox,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -52,11 +52,9 @@
                 <br />
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
 
-                        <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                        <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
                     </li>
                 </ul>
             </form>
diff --git a/dashboard-ui/usernew.html b/dashboard-ui/usernew.html
index 88992c5ab9..faaec13cb0 100644
--- a/dashboard-ui/usernew.html
+++ b/dashboard-ui/usernew.html
@@ -1,4 +1,4 @@
-<div id="newUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/usernew,emby-input,paper-checkbox,paper-button">
+<div id="newUserPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/usernew,emby-input,paper-checkbox,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -40,11 +40,9 @@
                 <br />
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
 
-                        <paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
+                        <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
                     </li>
                 </ul>
             </form>
diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html
index 4878d6ec02..4b28d65ded 100644
--- a/dashboard-ui/userparentalcontrol.html
+++ b/dashboard-ui/userparentalcontrol.html
@@ -1,4 +1,4 @@
-<div id="userParentalControlPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmpopup,scripts/userparentalcontrol,paper-checkbox,paper-button">
+<div id="userParentalControlPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="jqmpopup,scripts/userparentalcontrol,paper-checkbox,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -27,10 +27,10 @@
                 <div>
                     <div>
                         <h1 style="display:inline-block;vertical-align:middle;">${LabelBlockContentWithTags}</h1>
-                        <paper-button raised class="btnAddBlockedTag submit mini" style="margin-left:1em;" title="${ButtonAdd}">
+                        <button is="emby-button" type="button" class="raised btnAddBlockedTag submit mini" style="margin-left:1em;" title="${ButtonAdd}">
                             <iron-icon icon="add"></iron-icon>
                             <span>${ButtonAdd}</span>
-                        </paper-button>
+                        </button>
                     </div>
                     <div class="blockedTags" style="margin-top:.5em;">
 
@@ -55,9 +55,7 @@
                 </div>
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button type="submit" data-role="none" class="clearButton">
-                            <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                        </button>
+                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                     </li>
                 </ul>
 
diff --git a/dashboard-ui/userpassword.html b/dashboard-ui/userpassword.html
index 4ac5fc2201..2af5305440 100644
--- a/dashboard-ui/userpassword.html
+++ b/dashboard-ui/userpassword.html
@@ -1,4 +1,4 @@
-<div id="userPasswordPage" data-role="page" class="page type-interior userProfilesPage userPasswordPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/myprofile,scripts/userpassword,paper-checkbox,emby-input,paper-button">
+<div id="userPasswordPage" data-role="page" class="page type-interior userProfilesPage userPasswordPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/myprofile,scripts/userpassword,paper-checkbox,emby-input,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -21,21 +21,19 @@
                     <div class="detailSection">
                         <div class="detailSectionContent">
                             <div id="fldCurrentPassword" style="display: none;" class="inputContainer">
-                                <input is="emby-input" type="password" id="txtCurrentPassword" label="${LabelCurrentPassword}" autocomplete="off"/>
+                                <input is="emby-input" type="password" id="txtCurrentPassword" label="${LabelCurrentPassword}" autocomplete="off" />
                             </div>
                             <div class="inputContainer">
-                                <input is="emby-input" type="password" id="txtNewPassword" label="${LabelNewPassword}" autocomplete="off"/>
+                                <input is="emby-input" type="password" id="txtNewPassword" label="${LabelNewPassword}" autocomplete="off" />
                             </div>
                             <div class="inputContainer">
                                 <input is="emby-input" type="password" id="txtNewPasswordConfirm" label="${LabelNewPasswordConfirm}" autocomplete="off" />
                             </div>
                             <br />
                             <div>
-                                <button type="submit" data-role="none" class="clearButton">
-                                    <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                                </button>
+                                <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
                                 <div id="btnResetPassword" style="display: none;">
-                                    <paper-button raised class="cancel block" onclick="UpdatePasswordPage.resetPassword();"><iron-icon icon="lock"></iron-icon><span>${ButtonResetPassword}</span></paper-button>
+                                    <button is="emby-button" type="button" class="raised cancel block" onclick="UpdatePasswordPage.resetPassword();"><iron-icon icon="lock"></iron-icon><span>${ButtonResetPassword}</span></button>
                                 </div>
                             </div>
                         </div>
@@ -61,10 +59,8 @@
                             </div>
                             <br /><br />
                             <div>
-                                <button type="submit" data-role="none" class="clearButton">
-                                    <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
-                                </button>
-                                <paper-button id="btnResetEasyPassword" raised class="cancel block hide" onclick="UpdatePasswordPage.resetEasyPassword();"><iron-icon icon="lock"></iron-icon><span>${ButtonResetEasyPassword}</span></paper-button>
+                                <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                                <button is="emby-button" type="button" id="btnResetEasyPassword" class="raised cancel block hide" onclick="UpdatePasswordPage.resetEasyPassword();"><iron-icon icon="lock"></iron-icon><span>${ButtonResetEasyPassword}</span></button>
                             </div>
                         </div>
                     </div>
diff --git a/dashboard-ui/userprofiles.html b/dashboard-ui/userprofiles.html
index 72793aa7d7..1c658ef568 100644
--- a/dashboard-ui/userprofiles.html
+++ b/dashboard-ui/userprofiles.html
@@ -1,4 +1,4 @@
-<div id="userProfilesPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/userprofilespage,paper-button">
+<div id="userProfilesPage" data-role="page" class="page type-interior userProfilesPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Users" data-require="scripts/userprofilespage,emby-button">
 
     <div data-role="content">
         <div class="content-primary">
@@ -6,10 +6,10 @@
                 <h3 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
                     <span style="vertical-align:middle;">${HeaderUsers}</span>
                 </h3>
-                <paper-button raised class="btnAddUser submit mini" style="margin-left:1em;" title="${ButtonAddUser}">
+                <button is="emby-button" type="button" class="raised btnAddUser submit mini" style="margin-left:1em;" title="${ButtonAddUser}">
                     <iron-icon icon="add"></iron-icon>
                     <span>${ButtonAdd}</span>
-                </paper-button>
+                </button>
             </div>
             <div class="localUsers" style="text-align:left;margin-top:.5em;"></div>
 
@@ -17,10 +17,10 @@
                 <h3 style="margin:.6em 0;vertical-align:middle;display:inline-block;">
                     ${HeaderGuests}
                 </h3>
-                <paper-button raised class="btnInvite submit mini" style="margin-left:1em;" title="${ButtonInviteUser}">
+                <button is="emby-button" type="button" class="raised btnInvite submit mini" style="margin-left:1em;" title="${ButtonInviteUser}">
                     <iron-icon icon="add"></iron-icon>
                     <span>${ButtonAdd}</span>
-                </paper-button>
+                </button>
             </div>
             <div class="connectUsers" style="text-align:left;margin-top:.5em;"></div>
 
diff --git a/dashboard-ui/voice/voicedialog.js b/dashboard-ui/voice/voicedialog.js
index ef86777174..64445c2a35 100644
--- a/dashboard-ui/voice/voicedialog.js
+++ b/dashboard-ui/voice/voicedialog.js
@@ -1,4 +1,4 @@
-define(['dialogHelper', 'jQuery', 'paper-button'], function (dialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'emby-button'], function (dialogHelper, $) {
 
     var currentRecognition;
     var lang = 'en-US';
@@ -161,12 +161,12 @@ define(['dialogHelper', 'jQuery', 'paper-button'], function (dialogHelper, $) {
         html += '<p>' + Globalize.translate('MessageWeDidntRecognizeCommand') + '</p>';
 
         html += '<br/>';
-        html += '<paper-button raised class="submit block btnRetry"><iron-icon icon="mic"></iron-icon><span>' + Globalize.translate('ButtonTryAgain') + '</span></paper-button>';
+        html += '<button is="emby-button" type="button" class="raised submit block btnRetry"><iron-icon icon="mic"></iron-icon><span>' + Globalize.translate('ButtonTryAgain') + '</span></button>';
         html += '<p class="blockedMessage" style="display:none;">' + Globalize.translate('MessageIfYouBlockedVoice') + '<br/><br/></p>';
 
         html += '</div>';
 
-        html += '<paper-button raised class="block btnCancelVoiceInput" style="background-color:#444;"><iron-icon icon="close"></iron-icon><span>' + Globalize.translate('ButtonCancel') + '</span></paper-button>';
+        html += '<button is="emby-button" type="button" class="raised block btnCancelVoiceInput" style="background-color:#444;"><iron-icon icon="close"></iron-icon><span>' + Globalize.translate('ButtonCancel') + '</span></button>';
 
         // voiceHelpContent
         html += '</div>';
diff --git a/dashboard-ui/wizardagreement.html b/dashboard-ui/wizardagreement.html
index 9060e7d819..c961dabdfe 100644
--- a/dashboard-ui/wizardagreement.html
+++ b/dashboard-ui/wizardagreement.html
@@ -1,4 +1,4 @@
-<div id="wizardAgreementPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardagreement,paper-checkbox,paper-button">
+<div id="wizardAgreementPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardagreement,paper-checkbox,emby-button">
 
     <div data-role="content">
 
@@ -18,8 +18,8 @@
                 </div>
 
                 <div class="wizardNavigation">
-                    <button type="button" data-role="none" class="clearButton" style="width:auto;" onclick="history.back();"><paper-button raised class="subdued"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></paper-button></button>
-                    <button type="submit" data-role="none" class="clearButton" style="width:auto;"><paper-button raised class="accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></paper-button></button>
+                    <button is="emby-button" type="button" onclick="history.back();" class="raised subdued"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></button>
+                    <button is="emby-button" type="submit" class="raised raised accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/wizardfinish.html b/dashboard-ui/wizardfinish.html
index edf9658323..cf4621b546 100644
--- a/dashboard-ui/wizardfinish.html
+++ b/dashboard-ui/wizardfinish.html
@@ -37,8 +37,8 @@
             </p>
 
             <div class="wizardNavigation">
-                <button type="button" data-role="none" class="clearButton" style="width:auto;" onclick="history.back();"><paper-button raised class="subdued"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></paper-button></button>
-                <button class="btnWizardNext clearButton" type="button" data-role="none" style="width:auto;"><paper-button raised class="accent"><iron-icon icon="check"></iron-icon><span>${LabelFinish}</span></paper-button></button>
+                <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></button>
+                <button is="emby-button" type="button" class="raised btnWizardNext accent"><iron-icon icon="check"></iron-icon><span>${LabelFinish}</span></button>
             </div>
         </div>
 
diff --git a/dashboard-ui/wizardlibrary.html b/dashboard-ui/wizardlibrary.html
index f203683f91..3aba37790a 100644
--- a/dashboard-ui/wizardlibrary.html
+++ b/dashboard-ui/wizardlibrary.html
@@ -1,4 +1,4 @@
-<div id="wizardLibraryPage" data-role="page" class="page standalonePage wizardPage mediaLibraryPage" data-require="scripts/medialibrarypage,scripts/taskbutton,paper-button">
+<div id="wizardLibraryPage" data-role="page" class="page standalonePage wizardPage mediaLibraryPage" data-require="scripts/medialibrarypage,scripts/taskbutton,emby-button">
 
     <div data-role="content">
 
@@ -8,7 +8,7 @@
                 <h1 style="display:inline-block;">
                     ${HeaderSetupLibrary}
                 </h1>
-                <a href="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" target="_blank" class="clearLink" style="margin-top:-10px;display:inline-block;vertical-align:middle;margin-left:2em;"><paper-button raised class="secondary mini"><iron-icon icon="info"></iron-icon><span>${ButtonHelp}</span></paper-button></a>
+                <a href="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" target="_blank" class="clearLink" style="margin-top:-10px;display:inline-block;vertical-align:middle;margin-left:2em;"><button is="emby-button" type="button" class="raised secondary mini"><iron-icon icon="info"></iron-icon><span>${ButtonHelp}</span></button></a>
             </div>
 
             <br />
@@ -16,8 +16,8 @@
             <br />
             <br />
             <div class="wizardNavigation">
-                <button type="button" data-role="none" class="clearButton" style="width:auto;" onclick="history.back();"><paper-button raised class="subdued"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></paper-button></button>
-                <button type="button" data-role="none" class="clearButton" style="width:auto;" onclick="WizardLibraryPage.next();"><paper-button raised class="accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></paper-button></button>
+                <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></button>
+                <button is="emby-button" type="button" class="raised accent" onclick="WizardLibraryPage.next();"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></button>
             </div>
         </div>
 
diff --git a/dashboard-ui/wizardlivetvguide.html b/dashboard-ui/wizardlivetvguide.html
index 4a0cfdfe69..134dea36bd 100644
--- a/dashboard-ui/wizardlivetvguide.html
+++ b/dashboard-ui/wizardlivetvguide.html
@@ -1,4 +1,4 @@
-<div id="wizardGuidePage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardlivetvguide,paper-button">
+<div id="wizardGuidePage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardlivetvguide,emby-button">
 
     <div data-role="content">
 
@@ -8,7 +8,7 @@
                 <h1 style="display:inline-block;">
                     ${HeaderSetupTVGuide}
                 </h1>
-                <a href="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" target="_blank" class="clearLink" style="margin-top:-10px;display:inline-block;vertical-align:middle;margin-left:2em;"><paper-button raised class="secondary mini"><iron-icon icon="info"></iron-icon><span>${ButtonHelp}</span></paper-button></a>
+                <a href="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" target="_blank" class="clearLink" style="margin-top:-10px;display:inline-block;vertical-align:middle;margin-left:2em;"><button is="emby-button" type="button" class="raised secondary mini"><iron-icon icon="info"></iron-icon><span>${ButtonHelp}</span></button></a>
             </div>
 
             <br />
@@ -26,9 +26,9 @@
             <br />
             <br />
             <div class="wizardNavigation">
-                <button type="button" data-role="none" class="clearButton" style="width:auto;" onclick="history.back();"><paper-button raised class="subdued"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></paper-button></button>
-                <button type="button" data-role="none" class="clearButton btnNext" style="width:auto;"><paper-button raised class="accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></paper-button></button>
-                <button type="button" data-role="none" class="clearButton btnSkip" style="width:auto;"><paper-button raised style="background:#888;color:#fff;"><iron-icon icon="arrow-forward"></iron-icon><span>${ButtonSkip}</span></paper-button></button>
+                <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></button>
+                <button is="emby-button" type="button" class="raised btnNext accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></button>
+                <button is="emby-button" type="button" class="raised btnSkip" style="background: #888; color: #fff;"><iron-icon icon="arrow-forward"></iron-icon><span>${ButtonSkip}</span></button>
             </div>
         </div>
 
diff --git a/dashboard-ui/wizardlivetvtuner.html b/dashboard-ui/wizardlivetvtuner.html
index 3b6c0b5b3c..67c9b8289e 100644
--- a/dashboard-ui/wizardlivetvtuner.html
+++ b/dashboard-ui/wizardlivetvtuner.html
@@ -1,4 +1,4 @@
-<div id="wizardTunerPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardlivetvtuner,paper-input,paper-button">
+<div id="wizardTunerPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardlivetvtuner,paper-input,emby-button">
 
     <div data-role="content">
 
@@ -9,7 +9,7 @@
                     <h1 style="display:inline-block;">
                         ${HeaderSetupLiveTV}
                     </h1>
-                    <a href="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" target="_blank" class="clearLink" style="margin-top:-10px;display:inline-block;vertical-align:middle;margin-left:2em;"><paper-button raised class="secondary mini"><iron-icon icon="info"></iron-icon><span>${ButtonHelp}</span></paper-button></a>
+                    <a href="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" target="_blank" class="clearLink" style="margin-top:-10px;display:inline-block;vertical-align:middle;margin-left:2em;"><button is="emby-button" type="button" class="raised secondary mini"><iron-icon icon="info"></iron-icon><span>${ButtonHelp}</span></button></a>
                 </div>
 
                 <br />
@@ -28,9 +28,9 @@
                 <br />
                 <br />
                 <div class="wizardNavigation">
-                    <button type="button" data-role="none" class="clearButton" style="width:auto;" onclick="history.back();"><paper-button raised class="subdued"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></paper-button></button>
-                    <button type="submit" data-role="none" class="clearButton" style="width:auto;"><paper-button raised class="accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></paper-button></button>
-                    <button type="button" data-role="none" class="clearButton btnSkip" style="width:auto;"><paper-button raised style="background:#888;color:#fff;"><iron-icon icon="arrow-forward"></iron-icon><span>${ButtonSkip}</span></paper-button></button>
+                    <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></button>
+                    <button is="emby-button" type="submit" class="raised accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></button>
+                    <button is="emby-button" type="button" class="btnSkip raised" style="background: #888; color: #fff;"><iron-icon icon="arrow-forward"></iron-icon><span>${ButtonSkip}</span></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/wizardservice.html b/dashboard-ui/wizardservice.html
index 97c9b31fba..4391754bdf 100644
--- a/dashboard-ui/wizardservice.html
+++ b/dashboard-ui/wizardservice.html
@@ -1,4 +1,4 @@
-<div id="wizardServicePage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardservice,paper-button">
+<div id="wizardServicePage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardservice,emby-button">
 
     <div data-role="content">
 
@@ -14,8 +14,8 @@
             <p>${WindowsServiceIntro2}</p>
 
             <div class="wizardNavigation">
-                <button type="button" data-role="none" class="clearButton" style="width:auto;" onclick="history.back();"><paper-button raised class="subdued"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></paper-button></button>
-                <button id="btnNextPage" type="button" data-role="none" class="clearButton" style="width:auto;"><paper-button raised class="accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></paper-button></button>
+                <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></button>
+                <button is="emby-button" type="button" id="btnNextPage" class="raised accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></button>
             </div>
         </div>
 
diff --git a/dashboard-ui/wizardsettings.html b/dashboard-ui/wizardsettings.html
index 98985fa42f..bbcaee8a50 100644
--- a/dashboard-ui/wizardsettings.html
+++ b/dashboard-ui/wizardsettings.html
@@ -1,4 +1,4 @@
-<div id="wizardSettingsPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardsettings,paper-checkbox,paper-button">
+<div id="wizardSettingsPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardsettings,paper-checkbox,emby-button">
 
     <div data-role="content">
 
@@ -29,8 +29,8 @@
                 </div>
 
                 <div class="wizardNavigation">
-                    <button type="button" data-role="none" class="clearButton" style="width:auto;" onclick="history.back();"><paper-button raised class="subdued"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></paper-button></button>
-                    <button type="submit" data-role="none" class="clearButton" style="width:auto;"><paper-button raised class="accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></paper-button></button>
+                    <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></button>
+                    <button is="emby-button" type="submit" class="raised accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/wizardstart.html b/dashboard-ui/wizardstart.html
index 4e6f52f20a..9f5a6e293d 100644
--- a/dashboard-ui/wizardstart.html
+++ b/dashboard-ui/wizardstart.html
@@ -1,4 +1,4 @@
-<div id="wizardStartPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardstartpage,paper-button">
+<div id="wizardStartPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardstartpage,emby-button">
 
     <div data-role="content">
 
@@ -9,7 +9,7 @@
                     <h1 style="float:left;">
                         ${WelcomeToProject}
                     </h1>
-                    <a href="https://github.com/MediaBrowser/Wiki/wiki/Quick%20start" target="_blank" class="clearLink" style="float:right;margin-top:20px;"><paper-button raised class="secondary mini"><iron-icon icon="info"></iron-icon><span>${ButtonQuickStartGuide}</span></paper-button></a>
+                    <a href="https://github.com/MediaBrowser/Wiki/wiki/Quick%20start" target="_blank" class="clearLink" style="float:right;margin-top:20px;"><button is="emby-button" type="button" class="raised secondary mini"><iron-icon icon="info"></iron-icon><span>${ButtonQuickStartGuide}</span></button></a>
                 </div>
 
                 <br style="clear:both;" />
@@ -22,7 +22,7 @@
                 <br />
 
                 <div class="wizardNavigation" style="text-align:right;">
-                    <button type="submit" data-role="none" class="clearButton" style="width:auto;"><paper-button raised class="accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></paper-button></button>
+                    <button is="emby-button" type="submit" class="raised accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/wizarduser.html b/dashboard-ui/wizarduser.html
index 2eb290430e..20b952ba6e 100644
--- a/dashboard-ui/wizarduser.html
+++ b/dashboard-ui/wizarduser.html
@@ -1,4 +1,4 @@
-<div id="wizardUserPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizarduserpage,paper-input,paper-button">
+<div id="wizardUserPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizarduserpage,paper-input,emby-button">
 
     <div data-role="content">
 
@@ -24,8 +24,8 @@
                 </div>
                 <br />
                 <div class="wizardNavigation">
-                    <button type="button" data-role="none" class="clearButton" style="width:auto;"><paper-button raised class="subdued"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></paper-button></button>
-                    <button type="submit" data-role="none" class="clearButton" style="width:auto;"><paper-button raised class="accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></paper-button></button>
+                    <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></button>
+                    <button is="emby-button" type="submit" class="raised accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></button>
                 </div>
             </form>
         </div>