diff --git a/dashboard-ui/bower_components/iron-icon/.bower.json b/dashboard-ui/bower_components/iron-icon/.bower.json
index 1dd6bd32f0..75ac273a15 100644
--- a/dashboard-ui/bower_components/iron-icon/.bower.json
+++ b/dashboard-ui/bower_components/iron-icon/.bower.json
@@ -31,14 +31,14 @@
     "web-component-tester": "*",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
-  "homepage": "https://github.com/polymerelements/iron-icon",
+  "homepage": "https://github.com/PolymerElements/iron-icon",
   "_release": "1.0.7",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.7",
     "commit": "6f4d152dc3998a6cc12a5a585a654f893dc99381"
   },
-  "_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-icons/.bower.json b/dashboard-ui/bower_components/iron-icons/.bower.json
index 1fbaa11e5c..93533ec1bd 100644
--- a/dashboard-ui/bower_components/iron-icons/.bower.json
+++ b/dashboard-ui/bower_components/iron-icons/.bower.json
@@ -40,7 +40,7 @@
     "tag": "v1.0.5",
     "commit": "39da54afbc17af343d1f95e62c5c0c477492677a"
   },
-  "_source": "git://github.com/polymerelements/iron-icons.git",
+  "_source": "git://github.com/PolymerElements/iron-icons.git",
   "_target": "^1.0.0",
-  "_originalSource": "polymerelements/iron-icons"
+  "_originalSource": "PolymerElements/iron-icons"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/paper-behaviors/.bower.json b/dashboard-ui/bower_components/paper-behaviors/.bower.json
index 713d584e4f..a76af97568 100644
--- a/dashboard-ui/bower_components/paper-behaviors/.bower.json
+++ b/dashboard-ui/bower_components/paper-behaviors/.bower.json
@@ -45,7 +45,7 @@
     "tag": "v1.0.10",
     "commit": "4b244a542af2c6c271498dfb98b00ed284df1d6a"
   },
-  "_source": "git://github.com/PolymerElements/paper-behaviors.git",
+  "_source": "git://github.com/polymerelements/paper-behaviors.git",
   "_target": "^1.0.0",
-  "_originalSource": "PolymerElements/paper-behaviors"
+  "_originalSource": "polymerelements/paper-behaviors"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/paper-material/.bower.json b/dashboard-ui/bower_components/paper-material/.bower.json
index b602394732..af7e846750 100644
--- a/dashboard-ui/bower_components/paper-material/.bower.json
+++ b/dashboard-ui/bower_components/paper-material/.bower.json
@@ -37,7 +37,7 @@
     "tag": "v1.0.4",
     "commit": "05f3800d37f8c5cad63ac2cf279f01bffb7d4fe8"
   },
-  "_source": "git://github.com/PolymerElements/paper-material.git",
+  "_source": "git://github.com/polymerelements/paper-material.git",
   "_target": "^1.0.0",
-  "_originalSource": "PolymerElements/paper-material"
+  "_originalSource": "polymerelements/paper-material"
 }
\ No newline at end of file
diff --git a/dashboard-ui/bower_components/paper-ripple/.bower.json b/dashboard-ui/bower_components/paper-ripple/.bower.json
index 157225ee71..2f654d71c6 100644
--- a/dashboard-ui/bower_components/paper-ripple/.bower.json
+++ b/dashboard-ui/bower_components/paper-ripple/.bower.json
@@ -32,14 +32,14 @@
     "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
   },
   "ignore": [],
-  "homepage": "https://github.com/PolymerElements/paper-ripple",
+  "homepage": "https://github.com/polymerelements/paper-ripple",
   "_release": "1.0.5",
   "_resolution": {
     "type": "version",
     "tag": "v1.0.5",
     "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
   },
-  "_source": "git://github.com/PolymerElements/paper-ripple.git",
+  "_source": "git://github.com/polymerelements/paper-ripple.git",
   "_target": "^1.0.0",
-  "_originalSource": "PolymerElements/paper-ripple"
+  "_originalSource": "polymerelements/paper-ripple"
 }
\ No newline at end of file
diff --git a/dashboard-ui/collections.html b/dashboard-ui/collections.html
index 586ff01c64..ce215efa33 100644
--- a/dashboard-ui/collections.html
+++ b/dashboard-ui/collections.html
@@ -4,7 +4,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="boxsetsPage" data-role="page" class="page libraryPage backdropPage collectionEditorPage noSecondaryNavPage" data-backdroptype="movie,boxset" data-require="scripts/moviecollections">
+    <div id="boxsetsPage" data-role="page" class="page libraryPage backdropPage collectionEditorPage noSecondaryNavPage" data-backdroptype="movie,boxset" data-require="scripts/moviecollections,paper-fab">
 
         <div data-role="content">
             <div class="viewSettings">
diff --git a/dashboard-ui/components/collectioneditor/collectioneditor.js b/dashboard-ui/components/collectioneditor/collectioneditor.js
index 2adfef469c..186fb1dd1f 100644
--- a/dashboard-ui/components/collectioneditor/collectioneditor.js
+++ b/dashboard-ui/components/collectioneditor/collectioneditor.js
@@ -1,4 +1,4 @@
-define(['components/paperdialoghelper', 'paper-checkbox', 'paper-dialog', 'paper-input'], function () {
+define(['components/paperdialoghelper', 'paper-checkbox', 'paper-dialog', 'paper-input', 'paper-fab'], function () {
 
     function onSubmit() {
         Dashboard.showLoadingMsg();
diff --git a/dashboard-ui/components/directorybrowser/directorybrowser.js b/dashboard-ui/components/directorybrowser/directorybrowser.js
index 91050d696b..54c19cf2e0 100644
--- a/dashboard-ui/components/directorybrowser/directorybrowser.js
+++ b/dashboard-ui/components/directorybrowser/directorybrowser.js
@@ -1,4 +1,4 @@
-define(['components/paperdialoghelper', 'paper-item', 'paper-input'], function () {
+define(['components/paperdialoghelper', 'paper-item', 'paper-input', 'paper-fab'], function () {
 
     var systemInfo;
     function getSystemInfo() {
diff --git a/dashboard-ui/components/imagedownloader/imagedownloader.js b/dashboard-ui/components/imagedownloader/imagedownloader.js
index 600b756995..f9afdd10d1 100644
--- a/dashboard-ui/components/imagedownloader/imagedownloader.js
+++ b/dashboard-ui/components/imagedownloader/imagedownloader.js
@@ -1,4 +1,4 @@
-define(['components/paperdialoghelper', 'paper-checkbox', 'paper-dialog'], function () {
+define(['components/paperdialoghelper', 'paper-checkbox', 'paper-dialog', 'paper-fab'], function () {
 
     var currentItemId;
     var currentItemType;
diff --git a/dashboard-ui/components/imageeditor/imageeditor.js b/dashboard-ui/components/imageeditor/imageeditor.js
index 891ead37d6..f0029ed6ef 100644
--- a/dashboard-ui/components/imageeditor/imageeditor.js
+++ b/dashboard-ui/components/imageeditor/imageeditor.js
@@ -1,4 +1,4 @@
-define(['components/paperdialoghelper', 'css!css/metadataeditor.css'], function () {
+define(['components/paperdialoghelper', 'css!css/metadataeditor.css', 'paper-fab'], function () {
 
     var currentItem;
     var currentDeferred;
diff --git a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
index 5e1a75124d..9d48e4af4b 100644
--- a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
+++ b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
@@ -1,4 +1,4 @@
-define(['components/paperdialoghelper', 'paper-dialog', 'paper-input'], function () {
+define(['components/paperdialoghelper', 'paper-dialog', 'paper-input', 'paper-fab'], function () {
 
     var currentDeferred;
     var hasChanges;
diff --git a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
index 6038ee7eac..efd98dabad 100644
--- a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
+++ b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
@@ -1,4 +1,4 @@
-define(['components/paperdialoghelper'], function () {
+define(['components/paperdialoghelper', 'paper-fab'], function () {
 
     var currentDeferred;
     var hasChanges;
diff --git a/dashboard-ui/components/playlisteditor/playlisteditor.js b/dashboard-ui/components/playlisteditor/playlisteditor.js
index 613c008978..bec4230eff 100644
--- a/dashboard-ui/components/playlisteditor/playlisteditor.js
+++ b/dashboard-ui/components/playlisteditor/playlisteditor.js
@@ -1,4 +1,4 @@
-define(['components/paperdialoghelper', 'paper-dialog', 'paper-input'], function () {
+define(['components/paperdialoghelper', 'paper-dialog', 'paper-input', 'paper-fab'], function () {
 
     var lastPlaylistId = '';
 
diff --git a/dashboard-ui/components/subtitleeditor/subtitleeditor.js b/dashboard-ui/components/subtitleeditor/subtitleeditor.js
index 18859d8955..9264ca1534 100644
--- a/dashboard-ui/components/subtitleeditor/subtitleeditor.js
+++ b/dashboard-ui/components/subtitleeditor/subtitleeditor.js
@@ -1,4 +1,4 @@
-define(['components/paperdialoghelper'], function () {
+define(['components/paperdialoghelper', 'paper-fab'], function () {
 
     var currentItem;
 
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 41b27d5dda..f5a869ef42 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,tileitemcss,scripts/livetvcomponents">
+    <div id="itemDetailPage" data-role="page" class="page libraryPage itemDetailPage noSecondaryNavPage" data-theme="b" data-require="scripts/itemdetailpage,tileitemcss,scripts/livetvcomponents,paper-fab">
 
         <div id="tvShowsTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
diff --git a/dashboard-ui/livetvstatus.html b/dashboard-ui/livetvstatus.html
index a00e4007a5..2f16be089c 100644
--- a/dashboard-ui/livetvstatus.html
+++ b/dashboard-ui/livetvstatus.html
@@ -4,7 +4,7 @@
     <title>${TitleLiveTV}</title>
 </head>
 <body>
-    <div id="liveTvStatusPage" data-role="page" class="page type-interior liveTvSettingsPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvstatus,scripts/taskbutton">
+    <div id="liveTvStatusPage" data-role="page" class="page type-interior liveTvSettingsPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" data-require="scripts/livetvstatus,scripts/taskbutton,paper-fab">
 
         <div data-role="content">
             <div class="content-primary">
diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html
index c6aa2dfb36..1bc08dbd8b 100644
--- a/dashboard-ui/movies.html
+++ b/dashboard-ui/movies.html
@@ -4,7 +4,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="moviesPage" data-role="page" data-dom-cache="true" class="page libraryPage backdropPage pageWithAbsoluteTabs collectionEditorPage" data-backdroptype="movie" data-require="jqmpanel,jqmcollapsible,scripts/moviesrecommended,paper-tabs,neon-animated-pages,paper-checkbox">
+    <div id="moviesPage" data-role="page" data-dom-cache="true" class="page libraryPage backdropPage pageWithAbsoluteTabs collectionEditorPage" data-backdroptype="movie" data-require="jqmpanel,jqmcollapsible,scripts/moviesrecommended,paper-tabs,neon-animated-pages,paper-checkbox,paper-fab">
 
         <div class="libraryViewNav libraryViewNavWithMinHeight">
             <paper-tabs hidescrollbuttons noink>
diff --git a/dashboard-ui/mypreferenceshome.html b/dashboard-ui/mypreferenceshome.html
index 4e9cc41850..844ca64a5c 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,paper-checkbox" 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" data-backbutton="true" data-menubutton="false">
 
         <div data-role="content">
             <form class="homeScreenPreferencesForm userProfileSettingsForm" style="margin: 0 auto;">
diff --git a/dashboard-ui/mypreferencesmenu.html b/dashboard-ui/mypreferencesmenu.html
index 786c5e3501..297947add5 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">
+    <div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-contextname="${HeaderSettings}" data-require="scripts/mypreferencescommon,paper-fab">
 
         <div data-role="content">
             <div class="readOnlyContent" style="margin: 0 auto;">
diff --git a/dashboard-ui/mysync.html b/dashboard-ui/mysync.html
index 4dca98df71..4dda1c4910 100644
--- a/dashboard-ui/mysync.html
+++ b/dashboard-ui/mysync.html
@@ -4,7 +4,7 @@
     <title>${TitleSync}</title>
 </head>
 <body>
-    <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">
+    <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">
 
         <div data-role="content">
 
diff --git a/dashboard-ui/mysyncjob.html b/dashboard-ui/mysyncjob.html
index 17204550d6..44eae446f8 100644
--- a/dashboard-ui/mysyncjob.html
+++ b/dashboard-ui/mysyncjob.html
@@ -4,7 +4,7 @@
     <title>${TitleSync}</title>
 </head>
 <body>
-    <div id="mySyncJobPage" data-role="page" class="page libraryPage syncJobPage mySyncPage noSecondaryNavPage" data-contextname="${TitleSync}" data-require="jqmcollapsible,scripts/syncjob" data-backbutton="true" data-menubutton="false">
+    <div id="mySyncJobPage" data-role="page" class="page libraryPage syncJobPage mySyncPage noSecondaryNavPage" data-contextname="${TitleSync}" data-require="jqmcollapsible,scripts/syncjob,paper-fab" data-backbutton="true" data-menubutton="false">
 
         <div data-role="content">
 
diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html
index 16a3e96429..6d21988eae 100644
--- a/dashboard-ui/nowplaying.html
+++ b/dashboard-ui/nowplaying.html
@@ -4,7 +4,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage" data-contextname="${TitleRemoteControl}" data-theme="b" data-require="jqmcollapsible,scripts/nowplayingpage,buttonenabled,paper-slider,paper-tabs,neon-animated-pages">
+    <div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage" data-contextname="${TitleRemoteControl}" data-theme="b" data-require="jqmcollapsible,scripts/nowplayingpage,buttonenabled,paper-slider,paper-tabs,neon-animated-pages,paper-fab">
 
         <div class="libraryViewNav hide">
             <div>
diff --git a/dashboard-ui/scripts/devices.js b/dashboard-ui/scripts/devices.js
index 3ab6d970e4..4a1591f4aa 100644
--- a/dashboard-ui/scripts/devices.js
+++ b/dashboard-ui/scripts/devices.js
@@ -88,7 +88,9 @@
 
         })).then(function (result) {
 
-            load(page, result.Items);
+            require(['paper-fab'], function() {
+                load(page, result.Items);
+            });
 
             Dashboard.hideLoadingMsg();
         });
diff --git a/dashboard-ui/scripts/globalize.js b/dashboard-ui/scripts/globalize.js
index 2b2ebe9bc8..edc2ac4914 100644
--- a/dashboard-ui/scripts/globalize.js
+++ b/dashboard-ui/scripts/globalize.js
@@ -27,7 +27,8 @@
             }
 
             var url = getUrl(name, culture);
-            var requestUrl = url + "?v=" + window.dashboardVersion;
+
+            var requestUrl = url + "?v=" + AppInfo.appVersion;
 
             var xhr = new XMLHttpRequest();
             xhr.open('GET', requestUrl, true);
diff --git a/dashboard-ui/scripts/livetvcomponents.js b/dashboard-ui/scripts/livetvcomponents.js
index 410c910600..78d56d5ba8 100644
--- a/dashboard-ui/scripts/livetvcomponents.js
+++ b/dashboard-ui/scripts/livetvcomponents.js
@@ -1,96 +1,102 @@
 (function () {
 
     function getTimersHtml(timers) {
-        var html = '';
 
-        var index = '';
+        return new Promise(function (resolve, reject) {
 
-        for (var i = 0, length = timers.length; i < length; i++) {
+            require(['paper-fab'], function () {
+                var html = '';
 
-            var timer = timers[i];
+                var index = '';
 
-            var startDateText = LibraryBrowser.getFutureDateText(parseISO8601Date(timer.StartDate, { toLocal: true }));
+                for (var i = 0, length = timers.length; i < length; i++) {
 
-            if (startDateText != index) {
+                    var timer = timers[i];
 
-                if (index) {
+                    var startDateText = LibraryBrowser.getFutureDateText(parseISO8601Date(timer.StartDate, { toLocal: true }));
+
+                    if (startDateText != index) {
+
+                        if (index) {
+                            html += '</div>';
+                            html += '</div>';
+                        }
+
+                        html += '<div class="homePageSection">';
+                        html += '<h1>' + startDateText + '</h1>';
+                        html += '<div class="paperList">';
+                        index = startDateText;
+                    }
+
+                    html += '<paper-icon-item>';
+
+                    var program = timer.ProgramInfo || {};
+                    var imgUrl;
+
+                    if (program.ImageTags && program.ImageTags.Primary) {
+
+                        imgUrl = ApiClient.getScaledImageUrl(program.Id, {
+                            height: 80,
+                            tag: program.ImageTags.Primary,
+                            type: "Primary"
+                        });
+                    }
+
+                    if (imgUrl) {
+                        html += '<paper-fab mini class="blue" style="background-image:url(\'' + imgUrl + '\');background-repeat:no-repeat;background-position:center center;background-size: cover;" item-icon></paper-fab>';
+                    }
+                    else if (program.IsKids) {
+                        html += '<paper-fab mini style="background:#2196F3;" icon="person" item-icon></paper-fab>';
+                    }
+                    else if (program.IsSports) {
+                        html += '<paper-fab mini style="background:#8BC34A;" icon="person" item-icon></paper-fab>';
+                    }
+                    else if (program.IsMovie) {
+                        html += '<paper-fab mini icon="movie" item-icon></paper-fab>';
+                    }
+                    else if (program.IsNews) {
+                        html += '<paper-fab mini style="background:#673AB7;" icon="new-releases" item-icon></paper-fab>';
+                    }
+                    else {
+                        html += '<paper-fab mini class="blue" icon="live-tv" item-icon></paper-fab>';
+                    }
+
+                    html += '<paper-item-body two-line>';
+                    html += '<a class="clearLink" href="livetvtimer.html?id=' + timer.Id + '">';
+
+                    html += '<div>';
+                    html += timer.Name;
+                    html += '</div>';
+
+                    html += '<div secondary>';
+                    html += LibraryBrowser.getDisplayTime(timer.StartDate);
+                    html += ' - ' + LibraryBrowser.getDisplayTime(timer.EndDate);
+                    html += '</div>';
+
+                    html += '</a>';
+                    html += '</paper-item-body>';
+
+                    if (timer.SeriesTimerId) {
+                        html += '<div class="ui-li-aside" style="right:0;">';
+                        html += '<div class="timerCircle seriesTimerCircle"></div>';
+                        html += '<div class="timerCircle seriesTimerCircle"></div>';
+                        html += '<div class="timerCircle seriesTimerCircle"></div>';
+                        html += '</div>';
+                    }
+
+                    html += '<paper-icon-button icon="cancel" data-timerid="' + timer.Id + '" title="' + Globalize.translate('ButonCancelRecording') + '" class="btnDeleteTimer"></paper-icon-button>';
+
+                    html += '</paper-icon-item>';
+                }
+
+                if (timers.length) {
                     html += '</div>';
                     html += '</div>';
                 }
 
-                html += '<div class="homePageSection">';
-                html += '<h1>' + startDateText + '</h1>';
-                html += '<div class="paperList">';
-                index = startDateText;
-            }
-
-            html += '<paper-icon-item>';
-
-            var program = timer.ProgramInfo || {};
-            var imgUrl;
-
-            if (program.ImageTags && program.ImageTags.Primary) {
-
-                imgUrl = ApiClient.getScaledImageUrl(program.Id, {
-                    height: 80,
-                    tag: program.ImageTags.Primary,
-                    type: "Primary"
-                });
-            }
-
-            if (imgUrl) {
-                html += '<paper-fab mini class="blue" style="background-image:url(\'' + imgUrl + '\');background-repeat:no-repeat;background-position:center center;background-size: cover;" item-icon></paper-fab>';
-            }
-            else if (program.IsKids) {
-                html += '<paper-fab mini style="background:#2196F3;" icon="person" item-icon></paper-fab>';
-            }
-            else if (program.IsSports) {
-                html += '<paper-fab mini style="background:#8BC34A;" icon="person" item-icon></paper-fab>';
-            }
-            else if (program.IsMovie) {
-                html += '<paper-fab mini icon="movie" item-icon></paper-fab>';
-            }
-            else if (program.IsNews) {
-                html += '<paper-fab mini style="background:#673AB7;" icon="new-releases" item-icon></paper-fab>';
-            }
-            else {
-                html += '<paper-fab mini class="blue" icon="live-tv" item-icon></paper-fab>';
-            }
-
-            html += '<paper-item-body two-line>';
-            html += '<a class="clearLink" href="livetvtimer.html?id=' + timer.Id + '">';
-
-            html += '<div>';
-            html += timer.Name;
-            html += '</div>';
-
-            html += '<div secondary>';
-            html += LibraryBrowser.getDisplayTime(timer.StartDate);
-            html += ' - ' + LibraryBrowser.getDisplayTime(timer.EndDate);
-            html += '</div>';
-
-            html += '</a>';
-            html += '</paper-item-body>';
-
-            if (timer.SeriesTimerId) {
-                html += '<div class="ui-li-aside" style="right:0;">';
-                html += '<div class="timerCircle seriesTimerCircle"></div>';
-                html += '<div class="timerCircle seriesTimerCircle"></div>';
-                html += '<div class="timerCircle seriesTimerCircle"></div>';
-                html += '</div>';
-            }
-
-            html += '<paper-icon-button icon="cancel" data-timerid="' + timer.Id + '" title="' + Globalize.translate('ButonCancelRecording') + '" class="btnDeleteTimer"></paper-icon-button>';
-
-            html += '</paper-icon-item>';
-        }
-
-        if (timers.length) {
-            html += '</div>';
-            html += '</div>';
-        }
-
-        return html;
+                resolve(html);
+            });
+        });
     }
 
     window.LiveTvHelpers = {
diff --git a/dashboard-ui/scripts/livetvrecordings.js b/dashboard-ui/scripts/livetvrecordings.js
index cd8d6be0f1..77743adb58 100644
--- a/dashboard-ui/scripts/livetvrecordings.js
+++ b/dashboard-ui/scripts/livetvrecordings.js
@@ -109,8 +109,9 @@
 
         }).then(function (result) {
 
-            renderRecordingGroups(page, result.Items);
-
+            require(['paper-fab'], function () {
+                renderRecordingGroups(page, result.Items);
+            });
         });
     }
 
diff --git a/dashboard-ui/scripts/livetvseriestimer.js b/dashboard-ui/scripts/livetvseriestimer.js
index 327657fb98..5f0ad16d7a 100644
--- a/dashboard-ui/scripts/livetvseriestimer.js
+++ b/dashboard-ui/scripts/livetvseriestimer.js
@@ -141,15 +141,15 @@
 
         var timers = result.Items;
 
-        var html = LiveTvHelpers.getTimersHtml(timers);
+        LiveTvHelpers.getTimersHtml(timers).then(function(html) {
+            var elem = $('.scheduleTab', page).html(html);
 
-        var elem = $('.scheduleTab', page).html(html);
+            $('.btnDeleteTimer', elem).on('click', function () {
 
-        $('.btnDeleteTimer', elem).on('click', function () {
+                var id = this.getAttribute('data-timerid');
 
-            var id = this.getAttribute('data-timerid');
-
-            deleteTimer(page, id);
+                deleteTimer(page, id);
+            });
         });
     }
 
diff --git a/dashboard-ui/scripts/livetvseriestimers.js b/dashboard-ui/scripts/livetvseriestimers.js
index e85f9259b2..d4477a7252 100644
--- a/dashboard-ui/scripts/livetvseriestimers.js
+++ b/dashboard-ui/scripts/livetvseriestimers.js
@@ -104,7 +104,9 @@
 
         ApiClient.getLiveTvSeriesTimers(query).then(function (result) {
 
-            renderTimers(page, result.Items);
+            require(['paper-fab'], function() {
+                renderTimers(page, result.Items);
+            });
 
             LibraryBrowser.setLastRefreshed(page);
         });
diff --git a/dashboard-ui/scripts/livetvtimers.js b/dashboard-ui/scripts/livetvtimers.js
index b54ab26e1f..49c29216cc 100644
--- a/dashboard-ui/scripts/livetvtimers.js
+++ b/dashboard-ui/scripts/livetvtimers.js
@@ -21,18 +21,18 @@
 
     function renderTimers(page, timers) {
 
-        var html = LiveTvHelpers.getTimersHtml(timers);
+        LiveTvHelpers.getTimersHtml(timers).then(function (html) {
+            var elem = $('#items', page).html(html);
 
-        var elem = $('#items', page).html(html);
+            $('.btnDeleteTimer', elem).on('click', function () {
 
-        $('.btnDeleteTimer', elem).on('click', function () {
+                var id = this.getAttribute('data-timerid');
 
-            var id = this.getAttribute('data-timerid');
+                deleteTimer(page, id);
+            });
 
-            deleteTimer(page, id);
+            Dashboard.hideLoadingMsg();
         });
-
-        Dashboard.hideLoadingMsg();
     }
 
     function reload(page) {
diff --git a/dashboard-ui/scripts/notifications.js b/dashboard-ui/scripts/notifications.js
index 833c9bfcb8..a6d3b6df38 100644
--- a/dashboard-ui/scripts/notifications.js
+++ b/dashboard-ui/scripts/notifications.js
@@ -108,7 +108,7 @@
             });
         }
 
-        require(['humanedate'], function() {
+        require(['humanedate', 'paper-fab'], function () {
             for (var i = 0, length = list.length; i < length; i++) {
 
                 var notification = list[i];
diff --git a/dashboard-ui/scripts/notificationsettings.js b/dashboard-ui/scripts/notificationsettings.js
index af8917e926..56992faf66 100644
--- a/dashboard-ui/scripts/notificationsettings.js
+++ b/dashboard-ui/scripts/notificationsettings.js
@@ -66,7 +66,9 @@
 
         var page = this;
 
-        reload(page);
+        require(['paper-fab'], function () {
+            reload(page);
+        });
     });
 
 })(jQuery, window);
\ No newline at end of file
diff --git a/dashboard-ui/scripts/registrationservices.js b/dashboard-ui/scripts/registrationservices.js
index 0d44b7f8d5..e94adc4789 100644
--- a/dashboard-ui/scripts/registrationservices.js
+++ b/dashboard-ui/scripts/registrationservices.js
@@ -97,7 +97,7 @@
 
     function showPlaybackOverlay(deferred) {
 
-        require(['components/paperdialoghelper'], function () {
+        require(['components/paperdialoghelper', 'paper-fab'], function () {
 
             var dlg = PaperDialogHelper.createDialog({});
 
diff --git a/dashboard-ui/scripts/scheduledtaskspage.js b/dashboard-ui/scripts/scheduledtaskspage.js
index 5e68b9696d..19a008227d 100644
--- a/dashboard-ui/scripts/scheduledtaskspage.js
+++ b/dashboard-ui/scripts/scheduledtaskspage.js
@@ -279,7 +279,10 @@
         Dashboard.showLoadingMsg();
 
         startInterval();
-        reloadList(page);
+
+        require(['paper-fab', 'paper-progress'], function () {
+            reloadList(page);
+        });
 
         $(ApiClient).on("websocketmessage", onWebSocketMessage).on("websocketopen", onWebSocketConnectionOpen);
 
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index ddf663cd13..879fa446f9 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -185,7 +185,7 @@ var Dashboard = {
     importCss: function (url) {
 
         var originalUrl = url;
-        url += "?v=" + window.dashboardVersion;
+        url += "?v=" + AppInfo.appVersion;
 
         if (!Dashboard.importedCss) {
             Dashboard.importedCss = [];
@@ -1826,6 +1826,7 @@ var AppInfo = {};
         define("scale-up-animation", ["html!bower_components/neon-animation/animations/scale-up-animation.html"]);
         define("paper-dialog", ["html!bower_components/paper-dialog/paper-dialog.html"]);
         define("paper-fab", ["html!bower_components/paper-fab/paper-fab.html"]);
+        define("paper-progress", ["html!bower_components/paper-progress/paper-progress.html"]);
         define("paper-input", ["html!bower_components/paper-input/paper-input.html"]);
         define("paper-icon-item", ["html!bower_components/paper-item/paper-icon-item.html"]);
         define("paper-item-body", ["html!bower_components/paper-item/paper-item-body.html"]);
@@ -2005,7 +2006,6 @@ var AppInfo = {};
         deps.push('paper-icon-button');
 
         // TODO: These need to be removed
-        deps.push('paper-fab');
         deps.push('paper-icon-item');
         deps.push('paper-item-body');
 
diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js
index 162b8239d4..73b4644420 100644
--- a/dashboard-ui/scripts/sync.js
+++ b/dashboard-ui/scripts/sync.js
@@ -212,7 +212,7 @@
 
     function showSyncMenuInternal(options) {
 
-        require(['components/paperdialoghelper'], function () {
+        require(['components/paperdialoghelper', 'paper-fab'], function () {
 
             var userId = Dashboard.getCurrentUserId();
 
diff --git a/dashboard-ui/selectserver.html b/dashboard-ui/selectserver.html
index d25c138798..df09dcd665 100644
--- a/dashboard-ui/selectserver.html
+++ b/dashboard-ui/selectserver.html
@@ -4,7 +4,7 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="selectServerPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-theme="b" data-require="scripts/selectserver">
+    <div id="selectServerPage" data-role="page" class="page libraryPage noSecondaryNavPage" data-theme="b" data-require="scripts/selectserver,paper-fab">
 
         <div data-role="content">
 
@@ -19,7 +19,7 @@
                 <br />
                 <div class="noServersMessage" style="display:none;padding-left:5px;">
                     ${MessageNoServersAvailableToConnect}
-                    <br/><br />
+                    <br /><br />
                 </div>
 
                 <div class="addServer" style="margin:0 0 1em;">
diff --git a/dashboard-ui/shared.html b/dashboard-ui/shared.html
index 514d218b6a..47a5519482 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,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,paper-fab">
 
         <style>
             #publicSharedItemPage .header {
diff --git a/dashboard-ui/syncjob.html b/dashboard-ui/syncjob.html
index 4d35280661..207231630f 100644
--- a/dashboard-ui/syncjob.html
+++ b/dashboard-ui/syncjob.html
@@ -4,7 +4,7 @@
     <title>${TitleSync}</title>
 </head>
 <body>
-    <div id="syncJobPage" data-role="page" class="page type-interior syncConfigurationPage syncJobPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="jqmcontrolgroup,scripts/syncjob">
+    <div id="syncJobPage" data-role="page" class="page type-interior syncConfigurationPage syncJobPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Sync" data-require="jqmcontrolgroup,scripts/syncjob,paper-fab">
 
         <div data-role="content">
             <div class="content-primary">