diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css
index ad473866ad..a1e3964911 100644
--- a/dashboard-ui/css/card.css
+++ b/dashboard-ui/css/card.css
@@ -302,12 +302,13 @@
     position: relative;
 }
 
-    .iconCardImage .fa {
+    .iconCardImage iron-icon {
         color: rgb(255, 255, 255);
         position: absolute;
         left: 0;
         right: 0;
-        font-size: 50px;
+        width: 64px;
+        height: 64px;
         margin: auto;
         top: 25%;
     }
diff --git a/dashboard-ui/itemlist.html b/dashboard-ui/itemlist.html
index d32948e980..4171b54e2a 100644
--- a/dashboard-ui/itemlist.html
+++ b/dashboard-ui/itemlist.html
@@ -4,7 +4,7 @@
     <title></title>
 </head>
 <body>
-    <div id="itemListPage" data-role="page" class="page libraryPage folderListPage noSecondaryNavPage" data-require="scripts/itemlistpage,jqmicons">
+    <div id="itemListPage" data-role="page" class="page libraryPage folderListPage noSecondaryNavPage" data-require="scripts/itemlistpage">
         <div class="alphabetPicker">
         </div>
         <div data-role="content" class="itemListContent">
diff --git a/dashboard-ui/livetv.html b/dashboard-ui/livetv.html
index 8807cb08c4..7b359156b1 100644
--- a/dashboard-ui/livetv.html
+++ b/dashboard-ui/livetv.html
@@ -64,7 +64,7 @@
                             <div class="tvGuideHeader">
                                 <div class="channelTimeslotHeader">
                                     <div class="timeslotHeaderInner">
-                                        <a class="btnSelectDate" href="#" style="display:block;padding-left:5px;color:#fff;text-decoration:none;font-weight:normal!important;padding:4px 10px 4px 0;"><i class="fa fa-calendar" style="margin-right:3px;"></i><span class="currentDate"></span></a>
+                                        <a class="btnSelectDate" href="#" style="display:block;padding-left:5px;color:#fff;text-decoration:none;font-weight:normal!important;padding:4px 10px 4px 0;"><iron-icon icon="schedule" style="margin-right:3px;width:18px;height:18px;"></iron-icon><span class="currentDate" style="vertical-align: middle;"></span></a>
                                     </div>
                                 </div>
                                 <div class="timeslotHeaders hiddenScrollX"></div>
diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html
index ef9cf55305..83220cb680 100644
--- a/dashboard-ui/movies.html
+++ b/dashboard-ui/movies.html
@@ -4,10 +4,10 @@
     <title>Emby</title>
 </head>
 <body>
-    <div id="moviesRecommendedPage" data-role="page" class="page libraryPage backdropPage pageWithAbsoluteTabs collectionEditorPage" data-backdroptype="movie" data-require="jqmicons,scripts/moviesrecommended,paperbuttonstyle,scripts/moviestudios,scripts/moviepeople,scripts/moviegenres,scripts/movietrailers,scripts/queryfilters,scripts/movies,scripts/moviecollections">
+    <div id="moviesRecommendedPage" data-role="page" class="page libraryPage backdropPage pageWithAbsoluteTabs collectionEditorPage" data-backdroptype="movie" data-require="scripts/moviesrecommended,scripts/moviestudios,scripts/moviepeople,scripts/moviegenres,scripts/movietrailers,scripts/queryfilters,scripts/movies,scripts/moviecollections">
 
         <div class="libraryViewNav libraryViewNavWithMinHeight">
-            <paper-tabs style="display:none;min-width:800px;margin:auto;">
+            <paper-tabs style="display:none;min-width:770px;margin:auto;">
                 <paper-tab><iron-icon icon="info"></iron-icon>${TabSuggestions}</paper-tab>
                 <paper-tab><iron-icon icon="local-movies"></iron-icon>${TabMovies}</paper-tab>
                 <paper-tab class="movieTrailersTab"><iron-icon icon="movie"></iron-icon>${TabTrailers}</paper-tab>
@@ -88,7 +88,6 @@
                         <div class="viewSettings">
                             <div class="listTopPaging">
                             </div>
-                            <button class="btnTrailerReel" type="button" data-icon="action" data-inline="true" data-mini="true">${ButtonTrailerReel}</button>
                         </div>
                         <div class="itemsContainer"></div>
                         <p class="noItemsMessage" style="display:none;text-align:center;">${MessageNoTrailersFound}</p>
@@ -504,35 +503,6 @@
                 </div>
             </form>
         </div>
-
-        <div data-role="popup" class="popup popupTrailerReel" data-theme="a">
-
-            <div class="ui-bar-a" style="text-align: center; padding: 0 20px;">
-                <h3 style="margin: .5em;">${HeaderTrailerReel}</h3>
-            </div>
-
-            <div data-role="content">
-
-                <form class="popupTrailerReelForm" style="min-width: 200px;">
-
-                    <p>${HeaderTrailerReelHelp}</p>
-                    <div>
-                        <label for="chkUnwatchedOnly">${OptionPlayUnwatchedTrailersOnly}</label>
-                        <input id="chkUnwatchedOnly" class="chkUnwatchedOnly" data-mini="true" type="checkbox" />
-                    </div>
-                    <br />
-                    <p>
-                        <button type="submit" data-theme="b" data-icon="check" data-mini="true">
-                            ${ButtonOk}
-                        </button>
-                        <button type="button" data-icon="delete" onclick="$(this).parents('.popup').popup('close');" data-mini="true">
-                            ${ButtonCancel}
-                        </button>
-                    </p>
-                </form>
-            </div>
-
-        </div>
         <div data-role="panel" class="viewPanel genreViewPanel" data-theme="a" data-position="right" data-display="overlay" data-position-fixed="true">
             <form>
 
diff --git a/dashboard-ui/mypreferencesmenu.html b/dashboard-ui/mypreferencesmenu.html
index bd37157185..64d39a64bc 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,jqmicons">
+    <div id="myPreferencesMenuPage" data-role="page" class="page libraryPage userPreferencesPage noSecondaryNavPage" data-contextname="${HeaderSettings}" data-require="scripts/mypreferencescommon,paperbuttonstyle">
 
         <style>
             .listAvatar.green {
diff --git a/dashboard-ui/mysyncsettings.html b/dashboard-ui/mysyncsettings.html
index 5b7193dc8c..c75c03dc5b 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,jqmicons" data-backbutton="true" data-menubutton="false">
+    <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 data-role="content">
             <form class="userProfileSettingsForm" style="margin: 0 auto;">
diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html
index 354a29f3f2..e7c17dda3e 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="scripts/nowplayingpage,paperbuttonstyle,jqmicons">
+    <div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage" data-contextname="${TitleRemoteControl}" data-theme="b" data-require="scripts/nowplayingpage,paperbuttonstyle">
 
         <div data-role="content" style="overflow:visible;">
 
diff --git a/dashboard-ui/scripts/htmlmediarenderer.js b/dashboard-ui/scripts/htmlmediarenderer.js
index 42677f5b75..3dd71d57ab 100644
--- a/dashboard-ui/scripts/htmlmediarenderer.js
+++ b/dashboard-ui/scripts/htmlmediarenderer.js
@@ -360,9 +360,11 @@
                     requiresSettingStartTimeOnStart = elem.currentTime == 0;
                 }
 
+                tracks = tracks || [];
+
                 if (enableViblast(val)) {
 
-                    setTracks(elem, tracks || []);
+                    setTracks(elem, tracks);
 
                     viblast(elem).setup({
                         key: getViblastKey(),
@@ -375,10 +377,20 @@
 
                     elem.src = val;
 
-                    setTracks(elem, tracks || []);
+                    setTracks(elem, tracks);
 
                     $(elem).one("loadedmetadata", onLoadedMetadata);
                 }
+
+                var currentTrackIndex = -1;
+                for (var i = 0, length = tracks.length; i < length; i++) {
+                    if (tracks[i].isDefault) {
+                        currentTrackIndex = i;
+                        break;
+                    }
+                }
+
+                self.setCurrentTrackElement(currentTrackIndex);
             }
 
             currentSrc = val;
diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js
index 3622e65b44..64872b5d2b 100644
--- a/dashboard-ui/scripts/librarybrowser.js
+++ b/dashboard-ui/scripts/librarybrowser.js
@@ -1654,32 +1654,32 @@
             } else if (item.MediaType == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist") {
 
                 if (item.Name && options.showTitle) {
-                    icon = 'fa-music';
+                    icon = 'library-music';
                 }
                 cssClass += " defaultBackground";
 
             } else if (item.Type == "Recording" || item.Type == "Program" || item.Type == "TvChannel") {
 
                 if (item.Name && options.showTitle) {
-                    icon = 'fa-folder-open';
+                    icon = 'folder-open';
                 }
 
                 cssClass += " defaultBackground";
             } else if (item.MediaType == "Video" || item.Type == "Season" || item.Type == "Series") {
 
                 if (item.Name && options.showTitle) {
-                    icon = 'fa-video-camera';
+                    icon = 'videocam';
                 }
                 cssClass += " defaultBackground";
             } else if (item.Type == "Person") {
 
                 if (item.Name && options.showTitle) {
-                    icon = 'fa-user';
+                    icon = 'person';
                 }
                 cssClass += " defaultBackground";
             } else {
                 if (item.Name && options.showTitle) {
-                    icon = 'fa-folder-open';
+                    icon = 'folder-open';
                 }
                 cssClass += " defaultBackground";
             }
@@ -1765,7 +1765,7 @@
             html += '<a' + transition + ' class="' + anchorCssClass + '" href="' + href + '"' + defaultActionAttribute + '>';
             html += '<div class="' + imageCssClass + '" style="' + style + '"' + dataSrc + '>';
             if (icon) {
-                html += '<i class="fa ' + icon + '"></i>';
+                html += '<iron-icon icon="' + icon + '"></iron-icon>';
             }
             html += '</div>';
 
diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js
index 37494da875..8887b601dc 100644
--- a/dashboard-ui/scripts/movietrailers.js
+++ b/dashboard-ui/scripts/movietrailers.js
@@ -88,15 +88,6 @@
 
             LibraryBrowser.saveQueryValues(getSavedQueryKey(), query);
 
-            Dashboard.getCurrentUser().done(function (user) {
-
-                if (user.Policy.EnableMediaPlayback && result.Items.length) {
-                    $('.btnTrailerReel', page).show();
-                } else {
-                    $('.btnTrailerReel', page).hide();
-                }
-            });
-
             Dashboard.hideLoadingMsg();
         });
     }
@@ -130,36 +121,6 @@
         $('select.selectPageSize', viewPanel).val(query.Limit).selectmenu('refresh');
     }
 
-    function playReel(page) {
-
-        $('.popupTrailerReel', page).popup('close');
-
-        var reelQuery = {
-            UserId: Dashboard.getCurrentUserId(),
-            SortBy: 'Random',
-            Limit: 50,
-            Fields: "MediaSources,Chapters"
-        };
-
-        if ($('.chkUnwatchedOnly', page).checked()) {
-            reelQuery.Filters = "IsPlayed";
-        }
-
-        ApiClient.getJSON(ApiClient.getUrl('Trailers', reelQuery)).done(function (result) {
-
-            MediaController.play({
-                items: result.Items
-            });
-        });
-    }
-
-    function onSubmit() {
-        var page = $(this).parents('.page');
-
-        playReel(page);
-        return false;
-    }
-
     function initPage(page, tabContent, viewPanel) {
 
         $('.radioSortBy', viewPanel).on('click', function () {
@@ -222,14 +183,6 @@
             query.StartIndex = 0;
             reloadItems(tabContent, viewPanel);
         });
-
-        $('.btnTrailerReel', tabContent).on('click', function () {
-
-            $('.popupTrailerReel', page).popup('open');
-
-        });
-
-        $('.popupTrailerReelForm', page).off('submit', onSubmit).on('submit', onSubmit);
     }
 
     $(document).on('pageinitdepends', "#moviesRecommendedPage", function () {
