diff --git a/dashboard-ui/bower_components/emby-webcomponents/.bower.json b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
index 4e5aeeb2b6..77ed2b9fed 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/.bower.json
+++ b/dashboard-ui/bower_components/emby-webcomponents/.bower.json
@@ -16,12 +16,12 @@
   },
   "devDependencies": {},
   "ignore": [],
-  "version": "1.1.80",
-  "_release": "1.1.80",
+  "version": "1.1.81",
+  "_release": "1.1.81",
   "_resolution": {
     "type": "version",
-    "tag": "1.1.80",
-    "commit": "babf2d95fc689946e18922a8c9a782ad40d250fa"
+    "tag": "1.1.81",
+    "commit": "73f83352f8263cc516f9756c39791a0e38031c27"
   },
   "_source": "git://github.com/MediaBrowser/emby-webcomponents.git",
   "_target": "~1.1.5",
diff --git a/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js b/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js
index 27b8b92152..7eab9db445 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'layoutManager', 'dialogText', 'paper-button', 'css!./actionsheet'], function (paperdialoghelper, layoutManager, dialogText) {
+define(['dialogHelper', 'layoutManager', 'dialogText', 'paper-button', 'css!./actionsheet'], function (dialogHelper, layoutManager, dialogText) {
 
     function parentWithClass(elem, className) {
 
@@ -120,7 +120,7 @@
             dialogOptions.autoFocus = false;
         }
 
-        var dlg = paperdialoghelper.createDialog(dialogOptions);
+        var dlg = dialogHelper.createDialog(dialogOptions);
 
         dlg.classList.add('actionSheet');
 
@@ -213,7 +213,7 @@
 
                     var selectedId = actionSheetMenuItem.getAttribute('data-id');
 
-                    paperdialoghelper.close(dlg);
+                    dialogHelper.close(dlg);
 
                     // Add a delay here to allow the click animation to finish, for nice effect
                     setTimeout(function () {
@@ -229,7 +229,7 @@
 
             });
 
-            paperdialoghelper.open(dlg);
+            dialogHelper.open(dlg);
 
             if (pos) {
                 dlg.style.position = 'fixed';
diff --git a/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js b/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js
index 7030f5b0e9..4842b5a8b5 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/alert/alert.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'layoutManager', 'dialogText', 'html!./../prompt/icons.html', 'css!./../prompt/style.css', 'paper-button', 'paper-input'], function (paperdialoghelper, layoutManager, dialogText) {
+define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./../prompt/icons.html', 'css!./../prompt/style.css', 'paper-button', 'paper-input'], function (dialogHelper, layoutManager, dialogText) {
 
     return function (options) {
 
@@ -27,7 +27,7 @@ define(['paperdialoghelper', 'layoutManager', 'dialogText', 'html!./../prompt/ic
             dialogOptions.exitAnimationDuration = 200;
         }
 
-        var dlg = paperdialoghelper.createDialog(dialogOptions);
+        var dlg = dialogHelper.createDialog(dialogOptions);
 
         dlg.classList.add('promptDialog');
 
@@ -73,9 +73,9 @@ define(['paperdialoghelper', 'layoutManager', 'dialogText', 'html!./../prompt/ic
 
         dlg.querySelector('.btnSubmit').addEventListener('click', function (e) {
 
-            paperdialoghelper.close(dlg);
+            dialogHelper.close(dlg);
         });
 
-        return paperdialoghelper.open(dlg);
+        return dialogHelper.open(dlg);
     };
 });
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/emby-webcomponents/confirm/confirm.js b/dashboard-ui/bower_components/emby-webcomponents/confirm/confirm.js
index 5f343ed14a..8e85d2f6d0 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/confirm/confirm.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/confirm/confirm.js
@@ -39,7 +39,7 @@ define(['layoutManager', 'dialogText'], function (layoutManager, dialogText) {
         });
     }
 
-    function showConfirmInternal(options, paperdialoghelper, resolve, reject) {
+    function showConfirmInternal(options, dialogHelper, resolve, reject) {
 
         var dialogOptions = {
             removeOnClose: true
@@ -59,7 +59,7 @@ define(['layoutManager', 'dialogText'], function (layoutManager, dialogText) {
             dialogOptions.autoFocus = false;
         }
 
-        var dlg = paperdialoghelper.createDialog(dialogOptions);
+        var dlg = dialogHelper.createDialog(dialogOptions);
         var html = '';
 
         if (options.title) {
@@ -84,14 +84,14 @@ define(['layoutManager', 'dialogText'], function (layoutManager, dialogText) {
         var confirmed = false;
         dlg.querySelector('.btnConfirm').addEventListener('click', function () {
             confirmed = true;
-            paperdialoghelper.close(dlg);
+            dialogHelper.close(dlg);
         });
         dlg.querySelector('.btnCancel').addEventListener('click', function () {
             confirmed = false;
-            paperdialoghelper.close(dlg);
+            dialogHelper.close(dlg);
         });
 
-        paperdialoghelper.open(dlg).then(function () {
+        dialogHelper.open(dlg).then(function () {
 
             if (confirmed) {
                 resolve();
@@ -104,8 +104,8 @@ define(['layoutManager', 'dialogText'], function (layoutManager, dialogText) {
     function showConfirm(options) {
         return new Promise(function (resolve, reject) {
 
-            require(['paperdialoghelper', 'paper-button'], function (paperdialoghelper) {
-                showConfirmInternal(options, paperdialoghelper, resolve, reject);
+            require(['dialogHelper', 'paper-button'], function (dialogHelper) {
+                showConfirmInternal(options, dialogHelper, resolve, reject);
             });
         });
     }
diff --git a/dashboard-ui/bower_components/emby-webcomponents/paperdialoghelper/paperdialoghelper.css b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css
similarity index 86%
rename from dashboard-ui/bower_components/emby-webcomponents/paperdialoghelper/paperdialoghelper.css
rename to dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css
index 191c5ade6d..2dcea57ff3 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/paperdialoghelper/paperdialoghelper.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.css
@@ -1,4 +1,4 @@
-.paperDialog {
+.dialog {
     margin: 0;
     border-radius: 4px;
     z-index: 999999 !important;
@@ -15,7 +15,7 @@
     padding: 0;
 }
 
-    .paperDialog.fixedSize {
+    .dialog.fixedSize {
         position: fixed !important;
         top: 0 !important;
         bottom: 0 !important;
@@ -28,31 +28,31 @@
         width: auto;
     }
 
-    .paperDialog.scrollY {
+    .dialog.scrollY {
         overflow-y: auto;
         -webkit-overflow-scrolling: touch;
         overflow-x: hidden;
     }
 
-    .paperDialog.hiddenScroll::-webkit-scrollbar {
+    .dialog.hiddenScroll::-webkit-scrollbar {
         display: none;
     }
 
-    .paperDialog.hiddenScroll {
+    .dialog.hiddenScroll {
         -ms-overflow-style: none;
         overflow: -moz-scrollbars-none;
     }
 
 @media all and (min-width: 1280px) and (min-height: 720px) {
 
-    .paperDialog.medium {
+    .dialog.medium {
         top: 10% !important;
         bottom: 10% !important;
         left: 10% !important;
         right: 10% !important;
     }
 
-    .paperDialog.small {
+    .dialog.small {
         top: 10% !important;
         bottom: 10% !important;
         left: 20% !important;
@@ -62,7 +62,7 @@
 
 @media all and (min-width: 1280px) and (min-height: 720px) {
 
-    .paperDialog.fullscreen-border {
+    .dialog.fullscreen-border {
         top: 5% !important;
         bottom: 5% !important;
         left: 5% !important;
@@ -75,16 +75,16 @@
     overflow-y: hidden !important;
 }
 
-.paperDialog > * {
+.dialog > * {
     margin-top: 20px;
     padding: 0 24px;
 }
 
-    .paperDialog > *:first-child {
+    .dialog > *:first-child {
         margin-top: 24px;
     }
 
-.paperDialog .buttons {
+.dialog .buttons {
     position: relative;
     padding: 8px 8px 8px 24px;
     margin: 0;
@@ -117,12 +117,12 @@
     opacity: .6;
 }
 
-.paperDialog::backdrop {
+.dialog::backdrop {
     opacity: 0;
     background-color: #000;
     transition: opacity ease-out 0.2s;
 }
 
-.paperDialog.opened::backdrop {
+.dialog.opened::backdrop {
     opacity: .6;
 }
diff --git a/dashboard-ui/bower_components/emby-webcomponents/paperdialoghelper/paperdialoghelper.js b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js
similarity index 95%
rename from dashboard-ui/bower_components/emby-webcomponents/paperdialoghelper/paperdialoghelper.js
rename to dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js
index 4ce39a11a8..3bcf3684cf 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/paperdialoghelper/paperdialoghelper.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js
@@ -1,6 +1,6 @@
-define(['historyManager', 'focusManager', 'browser', 'layoutManager', 'inputManager', 'css!./paperdialoghelper.css'], function (historyManager, focusManager, browser, layoutManager, inputManager) {
+define(['historyManager', 'focusManager', 'browser', 'layoutManager', 'inputManager', 'css!./dialoghelper.css'], function (historyManager, focusManager, browser, layoutManager, inputManager) {
 
-    function paperDialogHashHandler(dlg, hash, resolve) {
+    function dialogHashHandler(dlg, hash, resolve) {
 
         var self = this;
         self.originalUrl = window.location.href;
@@ -147,7 +147,7 @@
 
         return new Promise(function (resolve, reject) {
 
-            new paperDialogHashHandler(dlg, 'dlg' + new Date().getTime(), resolve);
+            new dialogHashHandler(dlg, 'dlg' + new Date().getTime(), resolve);
         });
     }
 
@@ -271,6 +271,11 @@
 
         var dlg = document.createElement('dialog');
 
+        // If there's no native dialog support, use a plain div
+        if (!dlg.showModal) {
+            dlg = document.createElement('div');
+        }
+
         dlg.classList.add('hide');
 
         if (shouldLockDocumentScroll(options)) {
@@ -322,7 +327,7 @@
             dlg.exitAnimation = null;
         }
 
-        dlg.classList.add('paperDialog');
+        dlg.classList.add('dialog');
 
         dlg.classList.add('scrollY');
 
diff --git a/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js b/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js
index 14cc747b09..bd52ef3162 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/prompt/prompt.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'layoutManager', 'dialogText', 'html!./icons.html', 'css!./style.css', 'paper-button', 'paper-input'], function (paperdialoghelper, layoutManager, dialogText) {
+define(['dialogHelper', 'layoutManager', 'dialogText', 'html!./icons.html', 'css!./style.css', 'paper-button', 'paper-input'], function (dialogHelper, layoutManager, dialogText) {
 
     return function (options) {
 
@@ -27,7 +27,7 @@ define(['paperdialoghelper', 'layoutManager', 'dialogText', 'html!./icons.html',
             dialogOptions.exitAnimationDuration = 200;
         }
 
-        var dlg = paperdialoghelper.createDialog(dialogOptions);
+        var dlg = dialogHelper.createDialog(dialogOptions);
 
         dlg.classList.add('promptDialog');
 
@@ -75,7 +75,7 @@ define(['paperdialoghelper', 'layoutManager', 'dialogText', 'html!./icons.html',
         dlg.querySelector('form').addEventListener('submit', function (e) {
 
             submitValue = dlg.querySelector('.txtPromptValue').value;
-            paperdialoghelper.close(dlg);
+            dialogHelper.close(dlg);
             e.preventDefault();
             return false;
         });
@@ -94,10 +94,10 @@ define(['paperdialoghelper', 'layoutManager', 'dialogText', 'html!./icons.html',
 
         dlg.querySelector('.btnPromptExit').addEventListener('click', function (e) {
 
-            paperdialoghelper.close(dlg);
+            dialogHelper.close(dlg);
         });
 
-        return paperdialoghelper.open(dlg).then(function () {
+        return dialogHelper.open(dlg).then(function () {
             var value = submitValue;
             if (value) {
                 return value;
diff --git a/dashboard-ui/bower_components/emby-webcomponents/slideshow/slideshow.js b/dashboard-ui/bower_components/emby-webcomponents/slideshow/slideshow.js
index c6830a6d0d..24026b48dc 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/slideshow/slideshow.js
+++ b/dashboard-ui/bower_components/emby-webcomponents/slideshow/slideshow.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'inputManager', 'connectionManager', 'browser', 'css!./style', 'html!./icons', 'iron-icon-set', 'paper-fab', 'paper-icon-button', 'paper-spinner'], function (paperdialoghelper, inputmanager, connectionManager, browser) {
+define(['dialogHelper', 'inputManager', 'connectionManager', 'browser', 'css!./style', 'html!./icons', 'iron-icon-set', 'paper-fab', 'paper-icon-button', 'paper-spinner'], function (dialogHelper, inputmanager, connectionManager, browser) {
 
     return function (options) {
 
@@ -8,7 +8,7 @@ define(['paperdialoghelper', 'inputManager', 'connectionManager', 'browser', 'cs
 
         function createElements(options) {
 
-            dlg = paperdialoghelper.createDialog({
+            dlg = dialogHelper.createDialog({
                 exitAnimationDuration: options.interactive ? 400 : 800,
                 size: 'fullscreen'
             });
@@ -40,7 +40,7 @@ define(['paperdialoghelper', 'inputManager', 'connectionManager', 'browser', 'cs
             if (options.interactive) {
                 dlg.querySelector('.btnSlideshowExit').addEventListener('click', function (e) {
 
-                    paperdialoghelper.close(dlg);
+                    dialogHelper.close(dlg);
                 });
                 dlg.querySelector('.btnSlideshowNext').addEventListener('click', nextImage);
                 dlg.querySelector('.btnSlideshowPrevious').addEventListener('click', previousImage);
@@ -49,7 +49,7 @@ define(['paperdialoghelper', 'inputManager', 'connectionManager', 'browser', 'cs
 
             document.body.appendChild(dlg);
 
-            paperdialoghelper.open(dlg).then(function () {
+            dialogHelper.open(dlg).then(function () {
 
                 stopInterval();
                 dlg.parentNode.removeChild(dlg);
@@ -167,7 +167,7 @@ define(['paperdialoghelper', 'inputManager', 'connectionManager', 'browser', 'cs
                 if (options.loop === false) {
 
                     if (swiperInstance.activeIndex >= swiperInstance.slides.length - 1) {
-                        paperdialoghelper.close(dlg);
+                        dialogHelper.close(dlg);
                         return;
                     }
                 }
@@ -433,7 +433,7 @@ define(['paperdialoghelper', 'inputManager', 'connectionManager', 'browser', 'cs
             var dialog = dlg;
             if (dialog) {
 
-                paperdialoghelper.close(dialog);
+                dialogHelper.close(dialog);
             }
         };
     }
diff --git a/dashboard-ui/bower_components/iron-icon/.bower.json b/dashboard-ui/bower_components/iron-icon/.bower.json
index f0167baf13..9784e3a3b7 100644
--- a/dashboard-ui/bower_components/iron-icon/.bower.json
+++ b/dashboard-ui/bower_components/iron-icon/.bower.json
@@ -32,14 +32,14 @@
     "web-component-tester": "^4.0.0",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
-  "homepage": "https://github.com/polymerelements/iron-icon",
+  "homepage": "https://github.com/PolymerElements/iron-icon",
   "_release": "1.0.8",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.8",
     "commit": "f36b38928849ef3853db727faa8c9ef104d611eb"
   },
-  "_source": "git://github.com/polymerelements/iron-icon.git",
+  "_source": "git://github.com/PolymerElements/iron-icon.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-icon"
+  "_originalSource": "PolymerElements/iron-icon"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/iron-selector/.bower.json b/dashboard-ui/bower_components/iron-selector/.bower.json
index c6b481c2cb..66d7d54b0f 100644
--- a/dashboard-ui/bower_components/iron-selector/.bower.json
+++ b/dashboard-ui/bower_components/iron-selector/.bower.json
@@ -36,7 +36,7 @@
     "tag": "v1.3.0",
     "commit": "1662093611cda3fd29125cdab94a61d3d88093da"
   },
-  "_source": "git://github.com/polymerelements/iron-selector.git",
+  "_source": "git://github.com/PolymerElements/iron-selector.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-selector"
+  "_originalSource": "PolymerElements/iron-selector"
 }
\ No newline at end of file
diff --git a/dashboard-ui/components/collectioneditor/collectioneditor.js b/dashboard-ui/components/collectioneditor/collectioneditor.js
index 30013e731f..daa3b2095d 100644
--- a/dashboard-ui/components/collectioneditor/collectioneditor.js
+++ b/dashboard-ui/components/collectioneditor/collectioneditor.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'jQuery', 'paper-checkbox', 'paper-input'], function (paperDialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'paper-checkbox', 'paper-input'], function (dialogHelper, $) {
 
     function onSubmit() {
         Dashboard.showLoadingMsg();
@@ -39,7 +39,7 @@
 
             var id = result.Id;
 
-            paperDialogHelper.close(dlg);
+            dialogHelper.close(dlg);
             redirectToCollection(id);
 
         });
@@ -71,7 +71,7 @@
 
             Dashboard.hideLoadingMsg();
 
-            paperDialogHelper.close(dlg);
+            dialogHelper.close(dlg);
 
             require(['toast'], function (toast) {
                 toast(Globalize.translate('MessageItemsAdded'));
@@ -191,7 +191,7 @@
 
             items = items || [];
 
-            var dlg = paperDialogHelper.createDialog({
+            var dlg = dialogHelper.createDialog({
                 size: 'small'
             });
 
@@ -217,11 +217,11 @@
 
             $(dlg).on('close', onDialogClosed);
 
-            paperDialogHelper.open(dlg);
+            dialogHelper.open(dlg);
 
             $('.btnCancel', dlg).on('click', function () {
 
-                paperDialogHelper.close(dlg);
+                dialogHelper.close(dlg);
             });
         };
     }
diff --git a/dashboard-ui/components/directorybrowser/directorybrowser.js b/dashboard-ui/components/directorybrowser/directorybrowser.js
index e2f98773f0..d5e4400343 100644
--- a/dashboard-ui/components/directorybrowser/directorybrowser.js
+++ b/dashboard-ui/components/directorybrowser/directorybrowser.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'jQuery', 'paper-item', 'paper-input', 'paper-fab', 'paper-item-body'], function (paperDialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'paper-item', 'paper-input', 'paper-fab', 'paper-item-body'], function (dialogHelper, $) {
 
     var systemInfo;
     function getSystemInfo() {
@@ -207,7 +207,7 @@
 
             getSystemInfo().then(function (systemInfo) {
 
-                var dlg = paperDialogHelper.createDialog({
+                var dlg = dialogHelper.createDialog({
                     size: 'medium'
                 });
 
@@ -239,11 +239,11 @@
                 });
                 $(dlg).on('close', onDialogClosed);
 
-                paperDialogHelper.open(dlg);
+                dialogHelper.open(dlg);
 
                 $('.btnCloseDialog', dlg).on('click', function () {
 
-                    paperDialogHelper.close(dlg);
+                    dialogHelper.close(dlg);
                 });
 
                 currentDialog = dlg;
@@ -261,7 +261,7 @@
 
         self.close = function () {
             if (currentDialog) {
-                paperDialogHelper.close(currentDialog);
+                dialogHelper.close(currentDialog);
             }
         };
 
diff --git a/dashboard-ui/components/fileorganizer/fileorganizer.js b/dashboard-ui/components/fileorganizer/fileorganizer.js
index cf337a7770..714a9c8060 100644
--- a/dashboard-ui/components/fileorganizer/fileorganizer.js
+++ b/dashboard-ui/components/fileorganizer/fileorganizer.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'paper-checkbox', 'paper-input', 'paper-button'], function (paperDialogHelper) {
+define(['dialogHelper', 'paper-checkbox', 'paper-input', 'paper-button'], function (dialogHelper) {
 
     var extractedName;
     var extractedYear;
@@ -133,7 +133,7 @@
             Dashboard.hideLoadingMsg();
 
             dlg.submitted = true;
-            paperDialogHelper.close(dlg);
+            dialogHelper.close(dlg);
 
         }, onApiFailure);
     }
@@ -183,7 +183,7 @@
                 xhr.onload = function (e) {
 
                     var template = this.response;
-                    var dlg = paperDialogHelper.createDialog({
+                    var dlg = dialogHelper.createDialog({
                         removeOnClose: true,
                         size: 'small'
                     });
@@ -202,7 +202,7 @@
 
                     dlg.querySelector('.dialogHeaderTitle').innerHTML = Globalize.translate('FileOrganizeManually');
 
-                    paperDialogHelper.open(dlg);
+                    dialogHelper.open(dlg);
 
                     dlg.addEventListener('close', function () {
 
@@ -215,7 +215,7 @@
 
                     dlg.querySelector('.btnCancel').addEventListener('click', function (e) {
 
-                        paperDialogHelper.close(dlg);
+                        dialogHelper.close(dlg);
                     });
 
                     dlg.querySelector('form').addEventListener('submit', function (e) {
diff --git a/dashboard-ui/components/filterdialog/filterdialog.js b/dashboard-ui/components/filterdialog/filterdialog.js
index 27dc66da01..8d9d667626 100644
--- a/dashboard-ui/components/filterdialog/filterdialog.js
+++ b/dashboard-ui/components/filterdialog/filterdialog.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'events', 'browser', 'jQuery', 'paper-checkbox', 'emby-collapsible', 'css!components/filterdialog/style', 'paper-radio-button', 'paper-radio-group'], function (paperDialogHelper, events, browser, $) {
+define(['dialogHelper', 'events', 'browser', 'jQuery', 'paper-checkbox', 'emby-collapsible', 'css!components/filterdialog/style', 'paper-radio-button', 'paper-radio-group'], function (dialogHelper, events, browser, $) {
 
     function renderOptions(context, selector, cssClass, items, isCheckedFn) {
 
@@ -507,7 +507,7 @@
                 xhr.onload = function (e) {
 
                     var template = this.response;
-                    var dlg = paperDialogHelper.createDialog({
+                    var dlg = dialogHelper.createDialog({
                         removeOnClose: true,
                         modal: false,
                         entryAnimationDuration: 160,
@@ -526,7 +526,7 @@
                     setVisibility(dlg, options);
                     document.body.appendChild(dlg);
 
-                    paperDialogHelper.open(dlg);
+                    dialogHelper.open(dlg);
 
                     dlg.addEventListener('close', resolve);
 
diff --git a/dashboard-ui/components/guestinviter/guestinviter.js b/dashboard-ui/components/guestinviter/guestinviter.js
index a3863e971c..fd50277025 100644
--- a/dashboard-ui/components/guestinviter/guestinviter.js
+++ b/dashboard-ui/components/guestinviter/guestinviter.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'jQuery', 'paper-input', 'paper-button', 'emby-collapsible', 'paper-checkbox'], function (paperDialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'paper-input', 'paper-button', 'emby-collapsible', 'paper-checkbox'], function (dialogHelper, $) {
 
     function renderLibrarySharingList(context, result) {
 
@@ -56,7 +56,7 @@
             }).then(function (result) {
 
                 dlg.submitted = true;
-                paperDialogHelper.close(dlg);
+                dialogHelper.close(dlg);
 
                 Dashboard.hideLoadingMsg();
 
@@ -94,7 +94,7 @@
                 xhr.onload = function (e) {
 
                     var template = this.response;
-                    var dlg = paperDialogHelper.createDialog({
+                    var dlg = dialogHelper.createDialog({
                         removeOnClose: true,
                         size: 'small'
                     });
@@ -111,7 +111,7 @@
                     dlg.innerHTML = html;
                     document.body.appendChild(dlg);
 
-                    paperDialogHelper.open(dlg);
+                    dialogHelper.open(dlg);
 
                     dlg.addEventListener('close', function () {
 
@@ -124,7 +124,7 @@
 
                     dlg.querySelector('.btnCancel').addEventListener('click', function (e) {
 
-                        paperDialogHelper.close(dlg);
+                        dialogHelper.close(dlg);
                     });
 
                     dlg.querySelector('form').addEventListener('submit', function (e) {
diff --git a/dashboard-ui/components/imagedownloader/imagedownloader.js b/dashboard-ui/components/imagedownloader/imagedownloader.js
index 9377d9be29..084970cb6b 100644
--- a/dashboard-ui/components/imagedownloader/imagedownloader.js
+++ b/dashboard-ui/components/imagedownloader/imagedownloader.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'jQuery', 'paper-checkbox', 'paper-fab'], function (paperDialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'paper-checkbox', 'paper-fab'], function (dialogHelper, $) {
 
     var currentItemId;
     var currentItemType;
@@ -131,7 +131,7 @@
 
             hasChanges = true;
             var dlg = $(page).parents('dialog')[0];
-            paperDialogHelper.close(dlg);
+            dialogHelper.close(dlg);
         });
     }
 
@@ -271,7 +271,7 @@
             currentItemId = itemId;
             currentItemType = itemType;
 
-            var dlg = paperDialogHelper.createDialog({
+            var dlg = dialogHelper.createDialog({
                 size: 'fullscreen-border',
                 lockScroll: true
             });
@@ -298,14 +298,14 @@
             // Has to be assigned a z-index after the call to .open() 
             $(dlg).on('close', onDialogClosed);
 
-            paperDialogHelper.open(dlg);
+            dialogHelper.open(dlg);
 
             var editorContent = dlg.querySelector('.editorContent');
             initEditor(editorContent);
 
             $('.btnCloseDialog', dlg).on('click', function () {
 
-                paperDialogHelper.close(dlg);
+                dialogHelper.close(dlg);
             });
 
             reloadBrowsableImages(editorContent);
diff --git a/dashboard-ui/components/imageeditor/imageeditor.js b/dashboard-ui/components/imageeditor/imageeditor.js
index 921b5746bf..38a852f61e 100644
--- a/dashboard-ui/components/imageeditor/imageeditor.js
+++ b/dashboard-ui/components/imageeditor/imageeditor.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'jQuery', 'css!css/metadataeditor.css', 'paper-fab'], function (paperDialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'css!css/metadataeditor.css', 'paper-fab'], function (dialogHelper, $) {
 
     var currentItem;
     var currentDeferred;
@@ -245,7 +245,7 @@
             var template = this.response;
             ApiClient.getItem(Dashboard.getCurrentUserId(), itemId).then(function (item) {
 
-                var dlg = paperDialogHelper.createDialog({
+                var dlg = dialogHelper.createDialog({
                     size: 'fullscreen-border'
                 });
 
@@ -273,14 +273,14 @@
                 // Has to be assigned a z-index after the call to .open() 
                 $(dlg).on('close', onDialogClosed);
 
-                paperDialogHelper.open(dlg);
+                dialogHelper.open(dlg);
 
                 var editorContent = dlg.querySelector('.editorContent');
                 reload(editorContent, item);
 
                 $('.btnCloseDialog', dlg).on('click', function () {
 
-                    paperDialogHelper.close(dlg);
+                    dialogHelper.close(dlg);
                 });
             });
         }
diff --git a/dashboard-ui/components/imageuploader/imageuploader.js b/dashboard-ui/components/imageuploader/imageuploader.js
index d32f87ab11..259c99de67 100644
--- a/dashboard-ui/components/imageuploader/imageuploader.js
+++ b/dashboard-ui/components/imageuploader/imageuploader.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'jQuery', 'paper-fab'], function (paperDialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'paper-fab'], function (dialogHelper, $) {
 
     var currentItemId;
     var currentFile;
@@ -137,7 +137,7 @@
             var template = this.response;
             currentItemId = itemId;
 
-            var dlg = paperDialogHelper.createDialog({
+            var dlg = dialogHelper.createDialog({
                 size: 'fullscreen-border'
             });
 
@@ -163,7 +163,7 @@
             // Has to be assigned a z-index after the call to .open() 
             $(dlg).on('close', onDialogClosed);
 
-            paperDialogHelper.open(dlg);
+            dialogHelper.open(dlg);
 
             var editorContent = dlg.querySelector('.editorContent');
             initEditor(editorContent);
@@ -172,7 +172,7 @@
 
             $('.btnCloseDialog', dlg).on('click', function () {
 
-                paperDialogHelper.close(dlg);
+                dialogHelper.close(dlg);
             });
         }
 
diff --git a/dashboard-ui/components/itemidentifier/itemidentifier.js b/dashboard-ui/components/itemidentifier/itemidentifier.js
index 2eced8d885..ad1785b127 100644
--- a/dashboard-ui/components/itemidentifier/itemidentifier.js
+++ b/dashboard-ui/components/itemidentifier/itemidentifier.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'jQuery', 'paper-fab', 'paper-input', 'paper-checkbox'], function (paperDialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'paper-fab', 'paper-input', 'paper-checkbox'], function (dialogHelper, $) {
 
     var currentItem;
     var currentItemType;
@@ -110,7 +110,7 @@
         hasChanges = true;
         Dashboard.hideLoadingMsg();
 
-        paperDialogHelper.close(dlg);
+        dialogHelper.close(dlg);
     }
 
     function showIdentifyOptions(page, identifyResult) {
@@ -219,13 +219,13 @@
             hasChanges = true;
             Dashboard.hideLoadingMsg();
 
-            paperDialogHelper.close(page);
+            dialogHelper.close(page);
 
         }, function () {
 
             Dashboard.hideLoadingMsg();
 
-            paperDialogHelper.close(page);
+            dialogHelper.close(page);
         });
     }
 
@@ -287,7 +287,7 @@
                 currentItem = item;
                 currentItemType = currentItem.Type;
 
-                var dlg = paperDialogHelper.createDialog({
+                var dlg = dialogHelper.createDialog({
                     size: 'medium'
                 });
 
@@ -303,7 +303,7 @@
                 // Has to be assigned a z-index after the call to .open() 
                 $(dlg).on('close', onDialogClosed);
 
-                paperDialogHelper.open(dlg);
+                dialogHelper.open(dlg);
 
                 dlg.querySelector('.popupIdentifyForm').addEventListener('submit', function (e) {
 
@@ -321,7 +321,7 @@
 
                 $('.btnCancel', dlg).on('click', function () {
 
-                    paperDialogHelper.close(dlg);
+                    dialogHelper.close(dlg);
                 });
 
                 dlg.classList.add('identifyDialog');
@@ -353,7 +353,7 @@
 
             var template = this.response;
 
-            var dlg = paperDialogHelper.createDialog({
+            var dlg = dialogHelper.createDialog({
                 size: 'medium'
             });
 
@@ -366,11 +366,11 @@
             dlg.innerHTML = html;
             document.body.appendChild(dlg);
 
-            paperDialogHelper.open(dlg);
+            dialogHelper.open(dlg);
 
             dlg.querySelector('.btnCancel').addEventListener('click', function (e) {
 
-                paperDialogHelper.close(dlg);
+                dialogHelper.close(dlg);
             });
 
             dlg.querySelector('.popupIdentifyForm').addEventListener('submit', function (e) {
diff --git a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
index bbcf22206c..8c58d06b38 100644
--- a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
+++ b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'jQuery', 'paper-input', 'paper-fab', 'paper-item-body', 'paper-icon-item'], function (paperDialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'paper-input', 'paper-fab', 'paper-item-body', 'paper-icon-item'], function (dialogHelper, $) {
 
     var currentDeferred;
     var hasChanges;
@@ -30,7 +30,7 @@
         ApiClient.addVirtualFolder(name, type, currentOptions.refresh, paths).then(function () {
 
             hasChanges = true;
-            paperDialogHelper.close(dlg);
+            dialogHelper.close(dlg);
 
         }, function () {
 
@@ -196,7 +196,7 @@
             xhr.onload = function (e) {
 
                 var template = this.response;
-                var dlg = paperDialogHelper.createDialog({
+                var dlg = dialogHelper.createDialog({
                     size: 'small',
 
                     // In (at least) chrome this is causing the text field to not be editable
@@ -216,11 +216,11 @@
 
                 dlg.addEventListener('close', onDialogClosed);
 
-                paperDialogHelper.open(dlg);
+                dialogHelper.open(dlg);
 
                 dlg.querySelector('.btnCancel').addEventListener('click', function () {
 
-                    paperDialogHelper.close(dlg);
+                    dialogHelper.close(dlg);
                 });
 
                 paths = [];
diff --git a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
index 87bd50459b..9a1a5735b0 100644
--- a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
+++ b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'jQuery', 'paper-fab', 'paper-item-body', 'paper-icon-item'], function (paperDialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'paper-fab', 'paper-item-body', 'paper-icon-item'], function (dialogHelper, $) {
 
     var currentDeferred;
     var hasChanges;
@@ -150,7 +150,7 @@
             xhr.onload = function (e) {
 
                 var template = this.response;
-                var dlg = paperDialogHelper.createDialog({
+                var dlg = dialogHelper.createDialog({
                     size: 'small',
 
                     // In (at least) chrome this is causing the text field to not be editable
@@ -180,11 +180,11 @@
 
                 $(dlg).on('close', onDialogClosed);
 
-                paperDialogHelper.open(dlg);
+                dialogHelper.open(dlg);
 
                 $('.btnCloseDialog', dlg).on('click', function () {
 
-                    paperDialogHelper.close(dlg);
+                    dialogHelper.close(dlg);
                 });
 
                 refreshLibraryFromServer(editorContent);
diff --git a/dashboard-ui/components/metadataeditor/metadataeditor.js b/dashboard-ui/components/metadataeditor/metadataeditor.js
index bf3206fa91..f290ff6a8b 100644
--- a/dashboard-ui/components/metadataeditor/metadataeditor.js
+++ b/dashboard-ui/components/metadataeditor/metadataeditor.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'jQuery', 'paper-checkbox', 'paper-input', 'paper-item-body', 'paper-icon-item', 'paper-textarea', 'paper-fab'], function (paperDialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'paper-checkbox', 'paper-input', 'paper-item-body', 'paper-icon-item', 'paper-textarea', 'paper-fab'], function (dialogHelper, $) {
 
     var currentContext;
     var metadataEditorInfo;
@@ -7,7 +7,7 @@
     function closeDialog(isSubmitted) {
 
         if (currentContext.tagName == 'DIALOG') {
-            paperDialogHelper.close(currentContext);
+            dialogHelper.close(currentContext);
         }
     }
 
@@ -1220,7 +1220,7 @@
                 xhr.onload = function (e) {
 
                     var template = this.response;
-                    var dlg = paperDialogHelper.createDialog({
+                    var dlg = dialogHelper.createDialog({
                         removeOnClose: true,
                         size: 'medium'
                     });
@@ -1237,7 +1237,7 @@
                     dlg.innerHTML = html;
                     document.body.appendChild(dlg);
 
-                    paperDialogHelper.open(dlg);
+                    dialogHelper.open(dlg);
 
                     dlg.addEventListener('close', function () {
                         unbindItemChanged(dlg);
diff --git a/dashboard-ui/components/metadataeditor/personeditor.js b/dashboard-ui/components/metadataeditor/personeditor.js
index e4b1c9347a..99e748e9fb 100644
--- a/dashboard-ui/components/metadataeditor/personeditor.js
+++ b/dashboard-ui/components/metadataeditor/personeditor.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'jQuery'], function (paperDialogHelper, $) {
+define(['dialogHelper', 'jQuery'], function (dialogHelper, $) {
 
     return {
         show: function (person) {
@@ -10,7 +10,7 @@
                 xhr.onload = function (e) {
 
                     var template = this.response;
-                    var dlg = paperDialogHelper.createDialog({
+                    var dlg = dialogHelper.createDialog({
                         removeOnClose: true,
                         size: 'medium'
                     });
@@ -32,7 +32,7 @@
                     $('.selectPersonType', dlg).val(person.Type || '');
                     $('.txtPersonRole', dlg).val(person.Role || '');
 
-                    paperDialogHelper.open(dlg);
+                    dialogHelper.open(dlg);
 
                     dlg.addEventListener('close', function () {
 
@@ -45,7 +45,7 @@
 
                     dlg.querySelector('.btnCancel').addEventListener('click', function (e) {
 
-                        paperDialogHelper.close(dlg);
+                        dialogHelper.close(dlg);
                     });
 
                     dlg.querySelector('form').addEventListener('submit', function (e) {
@@ -56,7 +56,7 @@
                         person.Type = $('.selectPersonType', dlg).val();
                         person.Role = $('.txtPersonRole', dlg).val() || null;
 
-                        paperDialogHelper.close(dlg);
+                        dialogHelper.close(dlg);
 
                         e.preventDefault();
                         return false;
diff --git a/dashboard-ui/components/playlisteditor/playlisteditor.js b/dashboard-ui/components/playlisteditor/playlisteditor.js
index 158fd276d6..196d0c771f 100644
--- a/dashboard-ui/components/playlisteditor/playlisteditor.js
+++ b/dashboard-ui/components/playlisteditor/playlisteditor.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'jQuery', 'paper-input'], function (paperDialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'paper-input'], function (dialogHelper, $) {
 
     var lastPlaylistId = '';
 
@@ -52,7 +52,7 @@
 
             var id = result.Id;
 
-            paperDialogHelper.close(dlg);
+            dialogHelper.close(dlg);
             redirectToPlaylist(id);
         });
     }
@@ -73,7 +73,7 @@
 
             Dashboard.hideLoadingMsg();
 
-            paperDialogHelper.close(dlg);
+            dialogHelper.close(dlg);
             require(['toast'], function (toast) {
                 toast(Globalize.translate('MessageAddedToPlaylistSuccess'));
             });
@@ -196,7 +196,7 @@
 
             items = items || [];
 
-            var dlg = paperDialogHelper.createDialog({
+            var dlg = dialogHelper.createDialog({
                 size: 'small'
             });
 
@@ -223,11 +223,11 @@
 
             $(dlg).on('close', onDialogClosed);
 
-            paperDialogHelper.open(dlg);
+            dialogHelper.open(dlg);
 
             $('.btnCancel', dlg).on('click', function () {
 
-                paperDialogHelper.close(dlg);
+                dialogHelper.close(dlg);
             });
         };
     }
diff --git a/dashboard-ui/components/recordingcreator/recordingcreator.js b/dashboard-ui/components/recordingcreator/recordingcreator.js
index 1c5b284aef..9c6e73a62e 100644
--- a/dashboard-ui/components/recordingcreator/recordingcreator.js
+++ b/dashboard-ui/components/recordingcreator/recordingcreator.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'jQuery', 'scripts/livetvcomponents', 'livetvcss', 'paper-checkbox', 'paper-input', 'paper-toggle-button'], function (paperDialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'scripts/livetvcomponents', 'livetvcss', 'paper-checkbox', 'paper-input', 'paper-toggle-button'], function (dialogHelper, $) {
 
     var currentProgramId;
     var currentDialog;
@@ -40,7 +40,7 @@
     function closeDialog(isSubmitted) {
 
         recordingCreated = isSubmitted;
-        paperDialogHelper.close(currentDialog);
+        dialogHelper.close(currentDialog);
     }
 
     function onSubmit() {
@@ -334,7 +334,7 @@
             xhr.onload = function (e) {
 
                 var template = this.response;
-                var dlg = paperDialogHelper.createDialog({
+                var dlg = dialogHelper.createDialog({
                     removeOnClose: true,
                     size: 'small'
                 });
@@ -351,7 +351,7 @@
                 dlg.innerHTML = html;
                 document.body.appendChild(dlg);
 
-                paperDialogHelper.open(dlg);
+                dialogHelper.open(dlg);
 
                 currentDialog = dlg;
 
diff --git a/dashboard-ui/components/sharingwidget.js b/dashboard-ui/components/sharingwidget.js
index 06f3e27b33..c656413028 100644
--- a/dashboard-ui/components/sharingwidget.js
+++ b/dashboard-ui/components/sharingwidget.js
@@ -1,8 +1,8 @@
-define(['paperdialoghelper', 'jQuery', 'thirdparty/social-share-kit-1.0.4/dist/js/social-share-kit.min', 'css!thirdparty/social-share-kit-1.0.4/dist/css/social-share-kit.css'], function (paperDialogHelper, $) {
+define(['dialogHelper', 'jQuery', 'thirdparty/social-share-kit-1.0.4/dist/js/social-share-kit.min', 'css!thirdparty/social-share-kit-1.0.4/dist/css/social-share-kit.css'], function (dialogHelper, $) {
 
     function showMenu(options, successCallback, cancelCallback) {
 
-        var dlg = paperDialogHelper.createDialog({
+        var dlg = dialogHelper.createDialog({
             removeOnClose: true,
             autoFocus: false
         });
@@ -61,15 +61,15 @@
         // Has to be assigned a z-index after the call to .open() 
         $('.ssk', dlg).on('click', function () {
             isShared = true;
-            paperDialogHelper.close(dlg);
+            dialogHelper.close(dlg);
         });
 
         // Has to be assigned a z-index after the call to .open() 
         dlg.querySelector('.btnCancel').addEventListener('click', function () {
-            paperDialogHelper.close(dlg);
+            dialogHelper.close(dlg);
         });
 
-        paperDialogHelper.open(dlg);
+        dialogHelper.open(dlg);
     }
 
     return {
diff --git a/dashboard-ui/components/subtitleeditor/subtitleeditor.js b/dashboard-ui/components/subtitleeditor/subtitleeditor.js
index bb069fdeab..44ee4d38c7 100644
--- a/dashboard-ui/components/subtitleeditor/subtitleeditor.js
+++ b/dashboard-ui/components/subtitleeditor/subtitleeditor.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'appStorage', 'jQuery', 'paper-fab', 'paper-item-body', 'paper-icon-item'], function (paperDialogHelper, appStorage, $) {
+define(['dialogHelper', 'appStorage', 'jQuery', 'paper-fab', 'paper-item-body', 'paper-icon-item'], function (dialogHelper, appStorage, $) {
 
     var currentItem;
 
@@ -353,7 +353,7 @@
             var template = this.response;
             ApiClient.getItem(Dashboard.getCurrentUserId(), itemId).then(function (item) {
 
-                var dlg = paperDialogHelper.createDialog({
+                var dlg = dialogHelper.createDialog({
                     size: 'small',
                     removeOnClose: true
                 });
@@ -380,7 +380,7 @@
 
                 $('.subtitleSearchForm', dlg).off('submit', onSearchSubmit).on('submit', onSearchSubmit);
 
-                paperDialogHelper.open(dlg);
+                dialogHelper.open(dlg);
 
                 var editorContent = dlg.querySelector('.editorContent');
                 reload(editorContent, item);
@@ -392,7 +392,7 @@
 
                 $('.btnCancel', dlg).on('click', function () {
 
-                    paperDialogHelper.close(dlg);
+                    dialogHelper.close(dlg);
                 });
             });
         }
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index 41ce4d7cf7..15e9a07ecc 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -16,7 +16,7 @@
     margin-left: .5em;
 }
 
-.background-theme-b, .paperDialog.background-theme-b {
+.background-theme-b, .dialog.background-theme-b {
     background-color: #181818;
     /*background: radial-gradient(circle, #282828, #141414);*/
 }
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 68b041955a..09c3e3f43e 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -839,11 +839,11 @@ paper-input + .fieldDescription {
     box-shadow: -3px 0 10px 0 #555;*/
 }
 
-.background-theme-a, .paperDialog.background-theme-a {
+.background-theme-a, .dialog.background-theme-a {
     background-color: #f6f6f6;
 }
 
-.paperDialog:not(.background-theme-a):not(.background-theme-b) {
+.dialog:not(.background-theme-a):not(.background-theme-b) {
     background-color: #fff;
 }
 
diff --git a/dashboard-ui/devices/ios/ios.css b/dashboard-ui/devices/ios/ios.css
index 78c99ace38..05b68b6bd5 100644
--- a/dashboard-ui/devices/ios/ios.css
+++ b/dashboard-ui/devices/ios/ios.css
@@ -19,7 +19,7 @@
     background-attachment: initial;
 }
 
-.background-theme-b, .paperDialog.background-theme-b {
+.background-theme-b, .dialog.background-theme-b {
     background: #181818;
 }
 
diff --git a/dashboard-ui/devices/windowsphone/wp.css b/dashboard-ui/devices/windowsphone/wp.css
index c21b4f195e..a2423578a4 100644
--- a/dashboard-ui/devices/windowsphone/wp.css
+++ b/dashboard-ui/devices/windowsphone/wp.css
@@ -13,7 +13,7 @@
         font-weight: 400 !important;
     }
 
-.background-theme-b, .paperDialog.background-theme-b {
+.background-theme-b, .dialog.background-theme-b {
     background: #161616;
 }
 
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 5c08f96fde..4ed9d4a630 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -2941,9 +2941,9 @@
 
             showSortMenu: function (options) {
 
-                require(['paperdialoghelper', 'paper-radio-button', 'paper-radio-group'], function (paperDialogHelper) {
+                require(['dialogHelper', 'paper-radio-button', 'paper-radio-group'], function (dialogHelper) {
 
-                    var dlg = paperDialogHelper.createDialog({
+                    var dlg = dialogHelper.createDialog({
                         removeOnClose: true,
                         modal: false,
                         entryAnimationDuration: 160,
@@ -2989,7 +2989,7 @@
                     // Seeing an issue in Firefox and IE where it's initially visible in the bottom right, then moves to the center
                     var delay = browserInfo.animate ? 0 : 100;
                     setTimeout(function () {
-                        paperDialogHelper.open(dlg);
+                        dialogHelper.open(dlg);
                     }, delay);
 
                     dlg.querySelector('.groupSortBy').addEventListener('iron-select', function () {
diff --git a/dashboard-ui/scripts/registrationservices.js b/dashboard-ui/scripts/registrationservices.js
index e0ac814b10..f77e2945c9 100644
--- a/dashboard-ui/scripts/registrationservices.js
+++ b/dashboard-ui/scripts/registrationservices.js
@@ -97,9 +97,9 @@
 
     function showPlaybackOverlay(resolve, reject) {
 
-        require(['paperdialoghelper', 'paper-fab', 'paper-item-body', 'paper-icon-item'], function (paperDialogHelper) {
+        require(['dialogHelper', 'paper-fab', 'paper-item-body', 'paper-icon-item'], function (dialogHelper) {
 
-            var dlg = paperDialogHelper.createDialog({
+            var dlg = dialogHelper.createDialog({
                 size: 'fullscreen-border'
             });
 
@@ -144,10 +144,10 @@
                 resolve();
             });
 
-            paperDialogHelper.open(dlg);
+            dialogHelper.open(dlg);
 
             $('.btnCancelSupporterInfo').on('click', function () {
-                paperDialogHelper.close(dlg);
+                dialogHelper.close(dlg);
             });
         });
     }
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index dff45793f5..8b6aa6aac3 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1881,7 +1881,7 @@ var AppInfo = {};
 
         define("swiper", [bowerPath + "/Swiper/dist/js/swiper.min", "css!" + bowerPath + "/Swiper/dist/css/swiper.min"], returnFirstDependency);
 
-        define("paperdialoghelper", [embyWebComponentsBowerPath + "/paperdialoghelper/paperdialoghelper"], returnFirstDependency);
+        define("dialogHelper", [embyWebComponentsBowerPath + "/dialoghelper/dialoghelper"], returnFirstDependency);
         define("toast", [embyWebComponentsBowerPath + "/toast/toast"], returnFirstDependency);
         define("scrollHelper", [embyWebComponentsBowerPath + "/scrollhelper"], returnFirstDependency);
 
diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js
index 5ae2cbd24b..3a144dedcc 100644
--- a/dashboard-ui/scripts/sync.js
+++ b/dashboard-ui/scripts/sync.js
@@ -2,7 +2,7 @@
 
     var currentDialogOptions;
 
-    function submitJob(dlg, userId, syncOptions, form, paperDialogHelper) {
+    function submitJob(dlg, userId, syncOptions, form, dialogHelper) {
 
         if (!userId) {
             throw new Error('userId cannot be null');
@@ -53,7 +53,7 @@
 
         }).then(function () {
 
-            paperDialogHelper.close(dlg);
+            dialogHelper.close(dlg);
             require(['toast'], function (toast) {
                 toast(Globalize.translate('MessageSyncJobCreated'));
             });
@@ -218,7 +218,7 @@
 
     function showSyncMenuInternal(options) {
 
-        require(['paperdialoghelper', 'paper-fab'], function (paperDialogHelper) {
+        require(['dialogHelper', 'paper-fab'], function (dialogHelper) {
 
             var userId = Dashboard.getCurrentUserId();
 
@@ -236,7 +236,7 @@
 
                 currentDialogOptions = dialogOptions;
 
-                var dlg = paperDialogHelper.createDialog({
+                var dlg = dialogHelper.createDialog({
                     size: 'small',
                     removeOnClose: true,
                     autoFocus: false
@@ -270,16 +270,16 @@
                 dlg.innerHTML = html;
                 document.body.appendChild(dlg);
 
-                paperDialogHelper.open(dlg);
+                dialogHelper.open(dlg);
 
                 $('form', dlg).on('submit', function () {
 
-                    submitJob(dlg, userId, options, this, paperDialogHelper);
+                    submitJob(dlg, userId, options, this, dialogHelper);
                     return false;
                 });
 
                 $('.btnCancel', dlg).on('click', function () {
-                    paperDialogHelper.close(dlg);
+                    dialogHelper.close(dlg);
                 });
 
                 renderForm({
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index 0c85f33cff..20134f542b 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -551,7 +551,7 @@ div.dialogHeader {
     margin-left: .75em;
 }
 
-.paperDialog.popupEditor h2.dialogHeader {
+.dialog.popupEditor h2.dialogHeader {
     font-weight: inherit !important;
     line-height: 36px;
     padding: 0 1em;
@@ -563,7 +563,7 @@ div.dialogHeader {
     margin-bottom: 0;
 }
 
-.paperDialog.popupEditor {
+.dialog.popupEditor {
     padding-bottom: 100px;
 }
 
diff --git a/dashboard-ui/voice/voicedialog.js b/dashboard-ui/voice/voicedialog.js
index 76250a726a..bc5904943b 100644
--- a/dashboard-ui/voice/voicedialog.js
+++ b/dashboard-ui/voice/voicedialog.js
@@ -1,4 +1,4 @@
-define(['paperdialoghelper', 'jQuery'], function (paperDialogHelper, $) {
+define(['dialogHelper', 'jQuery'], function (dialogHelper, $) {
 
     var currentRecognition;
     var lang = 'en-US';
@@ -121,7 +121,7 @@ define(['paperdialoghelper', 'jQuery'], function (paperDialogHelper, $) {
     /// <returns> . </returns>
     function showVoiceHelp(groupid, title) {
 
-        var dlg = paperDialogHelper.createDialog({
+        var dlg = dialogHelper.createDialog({
             size: 'medium',
             removeOnClose: true
         });
@@ -176,7 +176,7 @@ define(['paperdialoghelper', 'jQuery'], function (paperDialogHelper, $) {
         dlg.innerHTML = html;
         document.body.appendChild(dlg);
 
-        paperDialogHelper.open(dlg);
+        dialogHelper.open(dlg);
         currentDialog = dlg;
 
         dlg.addEventListener('close', function () {
@@ -185,7 +185,7 @@ define(['paperdialoghelper', 'jQuery'], function (paperDialogHelper, $) {
 
         $('.btnCancelVoiceInput', dlg).on('click', function () {
             destroyCurrentRecognition();
-            paperDialogHelper.close(dlg);
+            dialogHelper.close(dlg);
         });
 
         $('.btnRetry', dlg).on('click', function () {
@@ -250,7 +250,7 @@ define(['paperdialoghelper', 'jQuery'], function (paperDialogHelper, $) {
 
                 var dlg = currentDialog;
                 if (dlg) {
-                    paperDialogHelper.close(dlg);
+                    dialogHelper.close(dlg);
                 }
             });