diff --git a/dashboard-ui/autoorganizelog.html b/dashboard-ui/autoorganizelog.html
index 733d98aa9..c7d133c1a 100644
--- a/dashboard-ui/autoorganizelog.html
+++ b/dashboard-ui/autoorganizelog.html
@@ -4,7 +4,7 @@
     <title>${TitleAutoOrganize}</title>
 </head>
 <body>
-    <div id="libraryFileOrganizerLogPage" data-role="page" class="page type-interior organizePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="jqmtable,jqmpopup,scripts/autoorganizelog,scripts/taskbutton,paperbuttonstyle,detailtablecss">
+    <div id="libraryFileOrganizerLogPage" data-role="page" class="page type-interior organizePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="jqmtable,jqmpopup,scripts/autoorganizelog,scripts/taskbutton,detailtablecss">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/connectlogin.html b/dashboard-ui/connectlogin.html
index fdbd65b32..9a722c4e8 100644
--- a/dashboard-ui/connectlogin.html
+++ b/dashboard-ui/connectlogin.html
@@ -4,7 +4,7 @@
     <title>${TitleSignIn}</title>
 </head>
 <body>
-    <div id="connectLoginPage" data-role="page" class="page standalonePage connectLoginPage" data-theme="b" data-require="scripts/connectlogin,paperbuttonstyle">
+    <div id="connectLoginPage" data-role="page" class="page standalonePage connectLoginPage" data-theme="b" data-require="scripts/connectlogin">
 
         <div data-role="content">
 
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 0368d7e5f..41b27d5dd 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -4,7 +4,7 @@
     <title></title>
 </head>
 <body>
-    <div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage noSecondaryNavPage" data-theme="b" data-require="scripts/itemdetailpage,paperbuttonstyle,tileitemcss,scripts/livetvcomponents">
+    <div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage noSecondaryNavPage" data-theme="b" data-require="scripts/itemdetailpage,tileitemcss,scripts/livetvcomponents">
 
         <div id="tvShowsTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html
index 3141f3f3e..4c32ae35b 100644
--- a/dashboard-ui/metadata.html
+++ b/dashboard-ui/metadata.html
@@ -4,7 +4,7 @@
     <title>${TitleMetadata}</title>
 </head>
 <body>
-    <div id="metadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadataconfigurationpage,paperbuttonstyle">
+    <div id="metadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadataconfigurationpage">
 
         <div data-role="content">
 
diff --git a/dashboard-ui/metadataadvanced.html b/dashboard-ui/metadataadvanced.html
index cd42e46c2..bcdc084b5 100644
--- a/dashboard-ui/metadataadvanced.html
+++ b/dashboard-ui/metadataadvanced.html
@@ -4,7 +4,7 @@
     <title>${TitleMetadata}</title>
 </head>
 <body>
-    <div id="advancedMetadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadataadvanced,paperbuttonstyle">
+    <div id="advancedMetadataConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadataadvanced">
 
         <div data-role="content">
 
diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html
index abee0409f..32c2f5715 100644
--- a/dashboard-ui/metadataimages.html
+++ b/dashboard-ui/metadataimages.html
@@ -4,7 +4,7 @@
     <title>${TitleMetadata}</title>
 </head>
 <body>
-    <div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadataimagespage,paperbuttonstyle">
+    <div id="metadataImagesConfigurationPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadataimagespage">
 
         <div data-role="content">
 
diff --git a/dashboard-ui/metadatanfo.html b/dashboard-ui/metadatanfo.html
index dc85860d2..26f06a388 100644
--- a/dashboard-ui/metadatanfo.html
+++ b/dashboard-ui/metadatanfo.html
@@ -4,7 +4,7 @@
     <title>${TitleMetadata}</title>
 </head>
 <body>
-    <div id="metadataNfoPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadatanfo,paperbuttonstyle">
+    <div id="metadataNfoPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadatanfo">
 
         <div data-role="content">
 
diff --git a/dashboard-ui/metadatasubtitles.html b/dashboard-ui/metadatasubtitles.html
index 7f1e43641..a597dbf8b 100644
--- a/dashboard-ui/metadatasubtitles.html
+++ b/dashboard-ui/metadatasubtitles.html
@@ -4,7 +4,7 @@
     <title>${TitleMetadata}</title>
 </head>
 <body>
-    <div id="metadataSubtitlesPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadatasubtitles,paperbuttonstyle">
+    <div id="metadataSubtitlesPage" data-role="page" class="page type-interior metadataConfigurationPage" data-require="scripts/metadatasubtitles">
 
         <div data-role="content">
 
diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html
index a751ff263..b7d39f5d6 100644
--- a/dashboard-ui/mypreferencesdisplay.html
+++ b/dashboard-ui/mypreferencesdisplay.html
@@ -5,7 +5,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="displayPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderDisplaySettings}" data-require="scripts/mypreferencesdisplay,paperbuttonstyle" data-backbutton="true" data-menubutton="false">
+    <div id="displayPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderDisplaySettings}" data-require="scripts/mypreferencesdisplay" data-backbutton="true" data-menubutton="false">
 
         <div data-role="content">
             <form class="displayPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
diff --git a/dashboard-ui/mypreferenceshome.html b/dashboard-ui/mypreferenceshome.html
index 00088f422..8bd4bb486 100644
--- a/dashboard-ui/mypreferenceshome.html
+++ b/dashboard-ui/mypreferenceshome.html
@@ -5,7 +5,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeScreenSettings}" data-require="scripts/mypreferenceshome,paperbuttonstyle" data-backbutton="true" data-menubutton="false">
+    <div id="homeScreenPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderHomeScreenSettings}" data-require="scripts/mypreferenceshome" data-backbutton="true" data-menubutton="false">
 
         <div data-role="content">
             <form class="homeScreenPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
diff --git a/dashboard-ui/mypreferenceslanguages.html b/dashboard-ui/mypreferenceslanguages.html
index a6a4ca3cb..e79570e54 100644
--- a/dashboard-ui/mypreferenceslanguages.html
+++ b/dashboard-ui/mypreferenceslanguages.html
@@ -5,7 +5,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="languagePreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderPlaybackSettings}" data-require="scripts/mypreferenceslanguages,paperbuttonstyle" data-backbutton="true" data-menubutton="false">
+    <div id="languagePreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${HeaderPlaybackSettings}" data-require="scripts/mypreferenceslanguages" data-backbutton="true" data-menubutton="false">
 
         <div data-role="content">
 
diff --git a/dashboard-ui/mypreferencesmenu.html b/dashboard-ui/mypreferencesmenu.html
index 2fc573140..786c5e350 100644
--- a/dashboard-ui/mypreferencesmenu.html
+++ b/dashboard-ui/mypreferencesmenu.html
@@ -5,7 +5,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-contextname="${HeaderSettings}" data-require="scripts/mypreferencescommon,paperbuttonstyle">
+    <div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-contextname="${HeaderSettings}" data-require="scripts/mypreferencescommon">
 
         <div data-role="content">
             <div class="readOnlyContent" style="margin: 0 auto;">
diff --git a/dashboard-ui/myprofile.html b/dashboard-ui/myprofile.html
index 5e9a5cbb7..96a7a46ef 100644
--- a/dashboard-ui/myprofile.html
+++ b/dashboard-ui/myprofile.html
@@ -4,7 +4,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage noSecondaryNavPage" data-title="${HeaderProfile}" data-require="jqmcollapsible,scripts/myprofile,paperbuttonstyle" data-backbutton="true" data-menubutton="false">
+    <div id="userImagePage" data-role="page" class="page libraryPage userPreferencesPage userPasswordPage noSecondaryNavPage" data-title="${HeaderProfile}" data-require="jqmcollapsible,scripts/myprofile" data-backbutton="true" data-menubutton="false">
 
         <div data-role="content">
             <br />
diff --git a/dashboard-ui/mysyncsettings.html b/dashboard-ui/mysyncsettings.html
index 62aaec2b6..aa77c4355 100644
--- a/dashboard-ui/mysyncsettings.html
+++ b/dashboard-ui/mysyncsettings.html
@@ -5,7 +5,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-require="scripts/mysyncsettings,paperbuttonstyle" data-backbutton="true" data-menubutton="false">
+    <div id="syncPreferencesPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-title="${ButtonSyncSettings}" data-require="scripts/mysyncsettings" data-backbutton="true" data-menubutton="false">
 
         <div data-role="content">
             <form class="userProfileSettingsForm" style="margin: 0 auto;">
diff --git a/dashboard-ui/notificationlist.html b/dashboard-ui/notificationlist.html
index c22e5dc8e..fc14d787a 100644
--- a/dashboard-ui/notificationlist.html
+++ b/dashboard-ui/notificationlist.html
@@ -4,7 +4,7 @@
     <title>${TitleNotifications}</title>
 </head>
 <body>
-    <div id="notificationsPage" data-role="page" class="page type-interior" data-require="scripts/notificationlist,paperbuttonstyle">
+    <div id="notificationsPage" data-role="page" class="page type-interior" data-require="scripts/notificationlist">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/scripts/actionsheet.js b/dashboard-ui/scripts/actionsheet.js
index c2b04b0cb..2b3f3affe 100644
--- a/dashboard-ui/scripts/actionsheet.js
+++ b/dashboard-ui/scripts/actionsheet.js
@@ -100,6 +100,24 @@
         setTimeout(function () {
             var dlg = document.getElementById(id);
 
+            // The animations flicker in IE and Firefox (probably wherever the polyfill is used)
+            if (browserInfo.chrome) {
+                dlg.animationConfig = {
+                    // scale up
+                    'entry': {
+                        name: 'scale-up-animation',
+                        node: dlg,
+                        timing: { duration: 160, easing: 'ease-out' }
+                    },
+                    // fade out
+                    'exit': {
+                        name: 'fade-out-animation',
+                        node: dlg,
+                        timing: { duration: 200, easing: 'ease-in' }
+                    }
+                };
+            }
+
             dlg.open();
 
             // Has to be assigned a z-index after the call to .open() 
diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js
index 5c1a61312..337456815 100644
--- a/dashboard-ui/scripts/edititemmetadata.js
+++ b/dashboard-ui/scripts/edititemmetadata.js
@@ -38,8 +38,8 @@
 
             loadExternalIds(page, item, metadataEditorInfo.ExternalIdInfos);
 
-            Dashboard.populateLanguages($('#selectLanguage', page), languages);
-            Dashboard.populateCountries($('#selectCountry', page), countries);
+            populateLanguages(page.querySelector('#selectLanguage'), languages);
+            populateCountries(page.querySelector('#selectCountry'), countries);
 
             LibraryBrowser.renderName(item, $('.itemName', page), true);
 
@@ -69,6 +69,38 @@
         });
     }
 
+    function populateCountries(select, allCountries) {
+
+        var html = "";
+
+        html += "<option value=''></option>";
+
+        for (var i = 0, length = allCountries.length; i < length; i++) {
+
+            var culture = allCountries[i];
+
+            html += "<option value='" + culture.TwoLetterISORegionName + "'>" + culture.DisplayName + "</option>";
+        }
+
+        select.innerHTML = html;
+    }
+
+    function populateLanguages(select, languages) {
+
+        var html = "";
+
+        html += "<option value=''></option>";
+
+        for (var i = 0, length = languages.length; i < length; i++) {
+
+            var culture = languages[i];
+
+            html += "<option value='" + culture.TwoLetterISOLanguageName + "'>" + culture.DisplayName + "</option>";
+        }
+
+        select.innerHTML = html;
+    }
+
     function renderContentTypeOptions(page, metadataInfo) {
 
         if (metadataInfo.ContentTypeOptions.length) {
diff --git a/dashboard-ui/scripts/metadataconfigurationpage.js b/dashboard-ui/scripts/metadataconfigurationpage.js
index 8e1a5ddaf..89c58fdf5 100644
--- a/dashboard-ui/scripts/metadataconfigurationpage.js
+++ b/dashboard-ui/scripts/metadataconfigurationpage.js
@@ -58,9 +58,41 @@
             load(page, config, allCultures, allCountries);
         });
 
+        function populateLanguages(select, languages) {
+
+            var html = "";
+
+            html += "<option value=''></option>";
+
+            for (var i = 0, length = languages.length; i < length; i++) {
+
+                var culture = languages[i];
+
+                html += "<option value='" + culture.TwoLetterISOLanguageName + "'>" + culture.DisplayName + "</option>";
+            }
+
+            select.innerHTML = html;
+        }
+
+        function populateCountries(select, allCountries) {
+
+            var html = "";
+
+            html += "<option value=''></option>";
+
+            for (var i = 0, length = allCountries.length; i < length; i++) {
+
+                var culture = allCountries[i];
+
+                html += "<option value='" + culture.TwoLetterISORegionName + "'>" + culture.DisplayName + "</option>";
+            }
+
+            select.innerHTML = html;
+        }
+
         ApiClient.getCultures().then(function (result) {
 
-            Dashboard.populateLanguages($('#selectLanguage', page), result);
+            populateLanguages(page.querySelector('#selectLanguage'), result);
 
             allCultures = result;
             load(page, config, allCultures, allCountries);
@@ -68,7 +100,7 @@
 
         ApiClient.getCountries().then(function (result) {
 
-            Dashboard.populateCountries($('#selectCountry', page), result);
+            populateCountries(page.querySelector('#selectCountry'), result);
 
             allCountries = result;
             load(page, config, allCultures, allCountries);
diff --git a/dashboard-ui/scripts/sharingwidget.js b/dashboard-ui/scripts/sharingwidget.js
index 84c0532f6..dbb4f3a80 100644
--- a/dashboard-ui/scripts/sharingwidget.js
+++ b/dashboard-ui/scripts/sharingwidget.js
@@ -4,7 +4,7 @@
 
         Dashboard.importCss('thirdparty/social-share-kit-1.0.4/dist/css/social-share-kit.css');
 
-        require(['paperbuttonstyle', 'thirdparty/social-share-kit-1.0.4/dist/js/social-share-kit.min'], function () {
+        require(['thirdparty/social-share-kit-1.0.4/dist/js/social-share-kit.min'], function () {
 
             var id = 'dlg' + new Date().getTime();
             var html = '';
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 733984701..d1de04108 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -521,29 +521,27 @@ var Dashboard = {
 
         if (typeof options == "string") {
 
-            require(['paperbuttonstyle'], function () {
-                var message = options;
+            var message = options;
 
-                Dashboard.toastId = Dashboard.toastId || 0;
+            Dashboard.toastId = Dashboard.toastId || 0;
 
-                var id = 'toast' + (Dashboard.toastId++);
+            var id = 'toast' + (Dashboard.toastId++);
 
-                var elem = document.createElement("paper-toast");
-                elem.setAttribute('text', message);
-                elem.id = id;
+            var elem = document.createElement("paper-toast");
+            elem.setAttribute('text', message);
+            elem.id = id;
 
-                document.body.appendChild(elem);
+            document.body.appendChild(elem);
+
+            // This timeout is obviously messy but it's unclear how to determine when the webcomponent is ready for use
+            // element onload never fires
+            setTimeout(function () {
+                elem.show();
 
-                // This timeout is obviously messy but it's unclear how to determine when the webcomponent is ready for use
-                // element onload never fires
                 setTimeout(function () {
-                    elem.show();
-
-                    setTimeout(function () {
-                        elem.parentNode.removeChild(elem);
-                    }, 5000);
-                }, 300);
-            });
+                    elem.parentNode.removeChild(elem);
+                }, 5000);
+            }, 300);
 
             return;
         }
@@ -1378,10 +1376,6 @@ var Dashboard = {
         html += '</div>';
 
         $(parent).prepend(html);
-
-        if (helpUrl) {
-            require(['paperbuttonstyle']);
-        }
     },
 
     setPageTitle: function (title) {
@@ -1439,38 +1433,6 @@ var Dashboard = {
         return parts.join(':');
     },
 
-    populateLanguages: function (select, languages) {
-
-        var html = "";
-
-        html += "<option value=''></option>";
-
-        for (var i = 0, length = languages.length; i < length; i++) {
-
-            var culture = languages[i];
-
-            html += "<option value='" + culture.TwoLetterISOLanguageName + "'>" + culture.DisplayName + "</option>";
-        }
-
-        select.innerHTML = html;
-    },
-
-    populateCountries: function (select, allCountries) {
-
-        var html = "";
-
-        html += "<option value=''></option>";
-
-        for (var i = 0, length = allCountries.length; i < length; i++) {
-
-            var culture = allCountries[i];
-
-            html += "<option value='" + culture.TwoLetterISORegionName + "'>" + culture.DisplayName + "</option>";
-        }
-
-        select.innerHTML = html;
-    },
-
     getSupportedRemoteCommands: function () {
 
         // Full list
@@ -1999,9 +1961,7 @@ var AppInfo = {};
         }
 
         define("connectservice", ["apiclient/connectservice"]);
-        define("paperbuttonstyle", [], function () {
-            return {};
-        });
+
         define("jqmicons", [], function () {
             Dashboard.importCss('thirdparty/jquerymobile-1.4.5/jquery.mobile.custom.icons.css');
             return {};
diff --git a/dashboard-ui/scripts/syncjob.js b/dashboard-ui/scripts/syncjob.js
index 7056a5757..5ea3bf6d5 100644
--- a/dashboard-ui/scripts/syncjob.js
+++ b/dashboard-ui/scripts/syncjob.js
@@ -2,8 +2,6 @@
 
     function renderJob(page, job, dialogOptions) {
 
-        require(['paperbuttonstyle']);
-
         var html = '';
 
         html += '<div>';
diff --git a/dashboard-ui/scripts/wizardsettings.js b/dashboard-ui/scripts/wizardsettings.js
index fa6b79822..f1a9a1c66 100644
--- a/dashboard-ui/scripts/wizardsettings.js
+++ b/dashboard-ui/scripts/wizardsettings.js
@@ -29,10 +29,42 @@
 
     }
 
+    function populateLanguages(select, languages) {
+
+        var html = "";
+
+        html += "<option value=''></option>";
+
+        for (var i = 0, length = languages.length; i < length; i++) {
+
+            var culture = languages[i];
+
+            html += "<option value='" + culture.TwoLetterISOLanguageName + "'>" + culture.DisplayName + "</option>";
+        }
+
+        select.innerHTML = html;
+    }
+
+    function populateCountries (select, allCountries) {
+
+        var html = "";
+
+        html += "<option value=''></option>";
+
+        for (var i = 0, length = allCountries.length; i < length; i++) {
+
+            var culture = allCountries[i];
+
+            html += "<option value='" + culture.TwoLetterISORegionName + "'>" + culture.DisplayName + "</option>";
+        }
+
+        select.innerHTML = html;
+    }
+
     function reloadData(page, config, cultures, countries) {
 
-        Dashboard.populateLanguages($('#selectLanguage', page), cultures);
-        Dashboard.populateCountries($('#selectCountry', page), countries);
+        populateLanguages(page.querySelector('#selectLanguage'), cultures);
+        populateCountries(page.querySelector('#selectCountry'), countries);
 
         $('#selectLanguage', page).val(config.PreferredMetadataLanguage);
         $('#selectCountry', page).val(config.MetadataCountryCode);
diff --git a/dashboard-ui/shared.html b/dashboard-ui/shared.html
index 860f9f512..514d218b6 100644
--- a/dashboard-ui/shared.html
+++ b/dashboard-ui/shared.html
@@ -4,7 +4,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="publicSharedItemPage" data-role="page" class="page standalonePage noSecondaryNavPage" data-theme="b" data-require="scripts/shared,scripts/itemdetailpage,paperbuttonstyle,tileitemcss,scripts/livetvcomponents">
+    <div id="publicSharedItemPage" data-role="page" class="page standalonePage noSecondaryNavPage" data-theme="b" data-require="scripts/shared,scripts/itemdetailpage,tileitemcss,scripts/livetvcomponents">
 
         <style>
             #publicSharedItemPage .header {
diff --git a/dashboard-ui/wizardstart.html b/dashboard-ui/wizardstart.html
index 658658b62..78f48de69 100644
--- a/dashboard-ui/wizardstart.html
+++ b/dashboard-ui/wizardstart.html
@@ -4,7 +4,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="wizardStartPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardstartpage,paperbuttonstyle">
+    <div id="wizardStartPage" data-role="page" class="page standalonePage wizardPage" data-require="scripts/wizardstartpage">
 
         <div data-role="content">
 
