diff --git a/dashboard-ui/channelitems.html b/dashboard-ui/channelitems.html
index d803c3784..afa4493b2 100644
--- a/dashboard-ui/channelitems.html
+++ b/dashboard-ui/channelitems.html
@@ -7,8 +7,8 @@
     <div id="channelItemsPage" data-role="page" class="page libraryPage channelsPage" data-contextname="${HeaderChannels}" data-require="scripts/channelitems">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="channelslatest.html" class="latestChannelItemsTab"><i class="material-icons">new_releases</i>${TabLatest}</a>
-            <a href="channels.html" class="ui-btn-active"><i class="material-icons">live_tv</i>${TabChannels}</a>
+            <a href="channelslatest.html" class="latestChannelItemsTab"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
+            <a href="channels.html" class="ui-btn-active"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
         </div>
 
         <div class="channelHeader"></div>
diff --git a/dashboard-ui/channels.html b/dashboard-ui/channels.html
index c7e34a051..200d8f203 100644
--- a/dashboard-ui/channels.html
+++ b/dashboard-ui/channels.html
@@ -7,8 +7,8 @@
     <div id="channelsPage" data-role="page" class="page libraryPage channelsPage" data-contextname="${HeaderChannels}" data-require="scripts/channels">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="channelslatest.html" class="latestChannelItemsTab"><i class="material-icons">new_releases</i>${TabLatest}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">live_tv</i>${TabChannels}</a>
+            <a href="channelslatest.html" class="latestChannelItemsTab"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
         </div>
 
         <div data-role="content">
diff --git a/dashboard-ui/channelslatest.html b/dashboard-ui/channelslatest.html
index 6bf8a4881..25d16ec21 100644
--- a/dashboard-ui/channelslatest.html
+++ b/dashboard-ui/channelslatest.html
@@ -7,8 +7,8 @@
     <div id="channelsLatestPage" data-role="page" class="page libraryPage channelsPage" data-contextname="${HeaderChannels}" data-require="scripts/sections,scripts/channelslatest,paperbuttonstyle">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="#" class="ui-btn-active latestChannelItemsTab"><i class="material-icons">new_releases</i>${TabLatest}</a>
-            <a href="channels.html"><i class="material-icons">live_tv</i>${TabChannels}</a>
+            <a href="#" class="ui-btn-active latestChannelItemsTab"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
+            <a href="channels.html"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
         </div>
 
         <div data-role="content">
diff --git a/dashboard-ui/collections.html b/dashboard-ui/collections.html
index a0a351c76..e8fd4402a 100644
--- a/dashboard-ui/collections.html
+++ b/dashboard-ui/collections.html
@@ -7,13 +7,13 @@
     <div id="boxsetsPage" data-role="page" class="page libraryPage backdropPage collectionEditorPage" data-backdroptype="movie,boxset">
 
         <div class="libraryViewNav scopedLibraryViewNav movieTabs">
-            <a href="moviesrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="movies.html"><i class="material-icons">local_movies</i>${TabMovies}</a>
-            <a href="movietrailers.html" class="movieTrailersTab"><i class="material-icons">movie</i>${TabTrailers}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">video_library</i>${TabCollections}</a>
-            <a href="moviegenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-            <a href="moviepeople.html" class="moviePeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-            <a href="moviestudios.html" class="movieStudiosTab"><i class="material-icons">account_box</i>${TabStudios}</a>
+            <a href="moviesrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="movies.html"><iron-icon icon="local-movies"></iron-icon>${TabMovies}</a>
+            <a href="movietrailers.html" class="movieTrailersTab"><iron-icon icon="movie"></iron-icon>${TabTrailers}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="video-library"></iron-icon>${TabCollections}</a>
+            <a href="moviegenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+            <a href="moviepeople.html" class="moviePeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+            <a href="moviestudios.html" class="movieStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabStudios}</a>
         </div>
 
         <div class="libraryViewNav scopedLibraryViewNav collectionTabs">
diff --git a/dashboard-ui/cordova/imagestore.js b/dashboard-ui/cordova/imagestore.js
index aab7b0092..f93c7e9b2 100644
--- a/dashboard-ui/cordova/imagestore.js
+++ b/dashboard-ui/cordova/imagestore.js
@@ -55,10 +55,9 @@
             if ($.browser.safari) {
 
                 // Use the embedded server for iOS8, and also if we don't know the iOS version, just to be safe
-                //if ($.browser.iOSVersion == 8 || !$.browser.iOSVersion)
-                {
+                //if (($.browser.iOSVersion || 0) < 9) {
                     return url.replace('file://', '');
-                }
+                //}
             }
             return url;
         }
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css
index cc994abf3..29c42836f 100644
--- a/dashboard-ui/css/librarybrowser.css
+++ b/dashboard-ui/css/librarybrowser.css
@@ -1017,11 +1017,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
         display: inline-block;
     }
 
-    .playedIndicator .material-icons {
-        font-size: 16px;
-        line-height: 24px;
-    }
-
 .textIndicator {
     height: 22px;
     padding-top: 2px;
diff --git a/dashboard-ui/css/librarymenu.css b/dashboard-ui/css/librarymenu.css
index 50dd00369..20d6f44d1 100644
--- a/dashboard-ui/css/librarymenu.css
+++ b/dashboard-ui/css/librarymenu.css
@@ -31,7 +31,7 @@
     display: inline-block;
 }
 
-.viewMenuBar .material-icons, .viewMenuBar .fa, .viewMenuBar paper-icon-button {
+.viewMenuBar .fa, .viewMenuBar paper-icon-button {
     color: #fff;
     vertical-align: middle;
 }
@@ -204,7 +204,7 @@
     background-color: transparent !important;
 }
 
-.libraryViewNav .material-icons {
+.libraryViewNav iron-icon {
     display: none;
 }
 
diff --git a/dashboard-ui/episodes.html b/dashboard-ui/episodes.html
index f72d7a695..04cdabe5d 100644
--- a/dashboard-ui/episodes.html
+++ b/dashboard-ui/episodes.html
@@ -7,14 +7,14 @@
     <div id="episodesPage" data-role="page" class="page libraryPage" data-require="scripts/episodes">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="tvrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="tvlatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a>
-            <a href="tvupcoming.html"><i class="material-icons">schedule</i>${TabUpcoming}</a>
-            <a href="tvshows.html"><i class="material-icons">live_tv</i>${TabShows}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">slideshow</i>${TabEpisodes}</a>
-            <a href="tvgenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-            <a href="tvpeople.html" class="tvPeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-            <a href="tvstudios.html" class="tvStudiosTab"><i class="material-icons">account_box</i>${TabNetworks}</a>
+            <a href="tvrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="tvlatest.html"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
+            <a href="tvupcoming.html"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
+            <a href="tvshows.html"><iron-icon icon="live-tv"></iron-icon>${TabShows}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="slideshow"></iron-icon>${TabEpisodes}</a>
+            <a href="tvgenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+            <a href="tvpeople.html" class="tvPeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+            <a href="tvstudios.html" class="tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
         </div>
 
         <div class="alphabetPicker">
diff --git a/dashboard-ui/index.html b/dashboard-ui/index.html
index d70a14ce0..010aca9ab 100644
--- a/dashboard-ui/index.html
+++ b/dashboard-ui/index.html
@@ -9,16 +9,16 @@
 
         <div class="libraryViewNav libraryViewNavWithMinHeight">
             <paper-tabs style="display:none;">
-                <paper-tab><i class="material-icons">home</i>${TabHome}</paper-tab>
-                <paper-tab><i class="material-icons">navigate_next</i>${TabNextUp}</paper-tab>
-                <paper-tab><i class="material-icons">favorite</i>${TabFavorites}</paper-tab>
-                <paper-tab><i class="material-icons">schedule</i>${TabUpcoming}</paper-tab>
+                <paper-tab><iron-icon icon="home"></iron-icon>${TabHome}</paper-tab>
+                <paper-tab><iron-icon icon="navigate-next"></iron-icon>${TabNextUp}</paper-tab>
+                <paper-tab><iron-icon icon="favorite"></iron-icon>${TabFavorites}</paper-tab>
+                <paper-tab><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</paper-tab>
             </paper-tabs>
             <div class="legacyTabs" style="display:none;">
-                <a href="index.html" class="ui-btn-active"><i class="material-icons">home</i>${TabHome}</a>
-                <a href="index.html?tab=1"><i class="material-icons">navigate_next</i>${TabNextUp}</a>
-                <a href="index.html?tab=2"><i class="material-icons">favorite</i>${TabFavorites}</a>
-                <a href="index.html?tab=3"><i class="material-icons">schedule</i>${TabUpcoming}</a>
+                <a href="index.html" class="ui-btn-active"><iron-icon icon="home"></iron-icon>${TabHome}</a>
+                <a href="index.html?tab=1"><iron-icon icon="navigate-next"></iron-icon>${TabNextUp}</a>
+                <a href="index.html?tab=2"><iron-icon icon="favorite"></iron-icon>${TabFavorites}</a>
+                <a href="index.html?tab=3"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
             </div>
         </div>
 
diff --git a/dashboard-ui/itembynamedetails.html b/dashboard-ui/itembynamedetails.html
index a164987d3..6d9c0d54d 100644
--- a/dashboard-ui/itembynamedetails.html
+++ b/dashboard-ui/itembynamedetails.html
@@ -8,93 +8,93 @@
     <div id="itemByNameDetailPage" data-role="page" class="page libraryPage itemDetailPage backdropPage" data-require="scripts/itembynamedetailpage">
         <div id="movieGenreTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="moviesrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-                <a href="movies.html"><i class="material-icons">local_movies</i>${TabMovies}</a>
-                <a href="movietrailers.html" class="movieTrailersTab"><i class="material-icons">movie</i>${TabTrailers}</a>
-                <a href="collections.html?context=movies"><i class="material-icons">video_library</i>${TabCollections}</a>
-                <a href="moviegenres.html" class="ui-btn-active"><i class="material-icons">video_library</i>${TabGenres}</a>
-                <a href="moviepeople.html" class="moviePeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-                <a href="moviestudios.html" class="movieStudiosTab"><i class="material-icons">account_box</i>${TabStudios}</a>
+                <a href="moviesrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+                <a href="movies.html"><iron-icon icon="local-movies"></iron-icon>${TabMovies}</a>
+                <a href="movietrailers.html" class="movieTrailersTab"><iron-icon icon="movie"></iron-icon>${TabTrailers}</a>
+                <a href="collections.html?context=movies"><iron-icon icon="video-library"></iron-icon>${TabCollections}</a>
+                <a href="moviegenres.html" class="ui-btn-active"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+                <a href="moviepeople.html" class="moviePeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+                <a href="moviestudios.html" class="movieStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabStudios}</a>
             </div>
         </div>
         <div id="moviePeopleTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="moviesrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-                <a href="movies.html"><i class="material-icons">local_movies</i>${TabMovies}</a>
-                <a href="movietrailers.html" class="movieTrailersTab"><i class="material-icons">movie</i>${TabTrailers}</a>
-                <a href="collections.html?context=movies"><i class="material-icons">video_library</i>${TabCollections}</a>
-                <a href="moviegenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-                <a href="moviepeople.html" class="ui-btn-active moviePeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-                <a href="moviestudios.html" class="movieStudiosTab"><i class="material-icons">account_box</i>${TabStudios}</a>
+                <a href="moviesrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+                <a href="movies.html"><iron-icon icon="local-movies"></iron-icon>${TabMovies}</a>
+                <a href="movietrailers.html" class="movieTrailersTab"><iron-icon icon="movie"></iron-icon>${TabTrailers}</a>
+                <a href="collections.html?context=movies"><iron-icon icon="video-library"></iron-icon>${TabCollections}</a>
+                <a href="moviegenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+                <a href="moviepeople.html" class="ui-btn-active moviePeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+                <a href="moviestudios.html" class="movieStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabStudios}</a>
             </div>
         </div>
         <div id="movieStudioTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="moviesrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-                <a href="movies.html"><i class="material-icons">local_movies</i>${TabMovies}</a>
-                <a href="movietrailers.html" class="movieTrailersTab"><i class="material-icons">movie</i>${TabTrailers}</a>
-                <a href="collections.html?context=movies"><i class="material-icons">video_library</i>${TabCollections}</a>
-                <a href="moviegenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-                <a href="moviepeople.html" class="moviePeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-                <a href="moviestudios.html" class="ui-btn-active movieStudiosTab"><i class="material-icons">account_box</i>${TabStudios}</a>
+                <a href="moviesrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+                <a href="movies.html"><iron-icon icon="local-movies"></iron-icon>${TabMovies}</a>
+                <a href="movietrailers.html" class="movieTrailersTab"><iron-icon icon="movie"></iron-icon>${TabTrailers}</a>
+                <a href="collections.html?context=movies"><iron-icon icon="video-library"></iron-icon>${TabCollections}</a>
+                <a href="moviegenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+                <a href="moviepeople.html" class="moviePeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+                <a href="moviestudios.html" class="ui-btn-active movieStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabStudios}</a>
             </div>
         </div>
         <div id="tvGenreTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="tvrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-                <a href="tvlatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a>
-                <a href="tvupcoming.html"><i class="material-icons">schedule</i>${TabUpcoming}</a>
-                <a href="tvshows.html"><i class="material-icons">live_tv</i>${TabShows}</a>
-                <a href="episodes.html" class="tvEpisodesTab"><i class="material-icons">slideshow</i>${TabEpisodes}</a>
-                <a href="tvgenres.html" class="ui-btn-active"><i class="material-icons">video_library</i>${TabGenres}</a>
-                <a href="tvpeople.html" class="tvPeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-                <a href="tvstudios.html" class="tvStudiosTab"><i class="material-icons">account_box</i>${TabNetworks}</a>
+                <a href="tvrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+                <a href="tvlatest.html"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
+                <a href="tvupcoming.html"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
+                <a href="tvshows.html"><iron-icon icon="live-tv"></iron-icon>${TabShows}</a>
+                <a href="episodes.html" class="tvEpisodesTab"><iron-icon icon="slideshow"></iron-icon>${TabEpisodes}</a>
+                <a href="tvgenres.html" class="ui-btn-active"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+                <a href="tvpeople.html" class="tvPeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+                <a href="tvstudios.html" class="tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
             </div>
         </div>
         <div id="tvPeopleTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="tvrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-                <a href="tvlatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a>
-                <a href="tvupcoming.html"><i class="material-icons">schedule</i>${TabUpcoming}</a>
-                <a href="tvshows.html"><i class="material-icons">live_tv</i>${TabShows}</a>
-                <a href="episodes.html" class="tvEpisodesTab"><i class="material-icons">slideshow</i>${TabEpisodes}</a>
-                <a href="tvgenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-                <a href="tvpeople.html" class="ui-btn-active tvPeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-                <a href="tvstudios.html" class="tvStudiosTab"><i class="material-icons">account_box</i>${TabNetworks}</a>
+                <a href="tvrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+                <a href="tvlatest.html"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
+                <a href="tvupcoming.html"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
+                <a href="tvshows.html"><iron-icon icon="live-tv"></iron-icon>${TabShows}</a>
+                <a href="episodes.html" class="tvEpisodesTab"><iron-icon icon="slideshow"></iron-icon>${TabEpisodes}</a>
+                <a href="tvgenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+                <a href="tvpeople.html" class="ui-btn-active tvPeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+                <a href="tvstudios.html" class="tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
             </div>
         </div>
         <div id="tvStudioTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="tvrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-                <a href="tvlatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a>
-                <a href="tvupcoming.html"><i class="material-icons">schedule</i>${TabUpcoming}</a>
-                <a href="tvshows.html"><i class="material-icons">live_tv</i>${TabShows}</a>
-                <a href="episodes.html" class="tvEpisodesTab"><i class="material-icons">slideshow</i>${TabEpisodes}</a>
-                <a href="tvgenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-                <a href="tvpeople.html" class="tvPeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-                <a href="tvstudios.html" class="ui-btn-active tvStudiosTab"><i class="material-icons">account_box</i>${TabNetworks}</a>
+                <a href="tvrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+                <a href="tvlatest.html"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
+                <a href="tvupcoming.html"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
+                <a href="tvshows.html"><iron-icon icon="live-tv"></iron-icon>${TabShows}</a>
+                <a href="episodes.html" class="tvEpisodesTab"><iron-icon icon="slideshow"></iron-icon>${TabEpisodes}</a>
+                <a href="tvgenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+                <a href="tvpeople.html" class="tvPeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+                <a href="tvstudios.html" class="ui-btn-active tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
             </div>
         </div>
         <div id="musicGenreTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="musicrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-                <a href="musicalbums.html"><i class="material-icons">album</i>${TabAlbums}</a>
-                <a href="musicalbumartists.html"><i class="material-icons">music_note</i>${TabAlbumArtists}</a>
-                <a href="musicartists.html" class="musicArtistsTab"><i class="material-icons">music_note</i>${TabArtists}</a>
-                <a href="songs.html" class="musicSongsTab"><i class="material-icons">music_note</i>${TabSongs}</a>
-                <a href="musicgenres.html" class="ui-btn-active"><i class="material-icons">library_music</i>${TabGenres}</a>
-                <a href="musicvideos.html"><i class="material-icons">video_library</i>${TabMusicVideos}</a>
+                <a href="musicrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+                <a href="musicalbums.html"><iron-icon icon="album"></iron-icon>${TabAlbums}</a>
+                <a href="musicalbumartists.html"><iron-icon icon="music-note"></iron-icon>${TabAlbumArtists}</a>
+                <a href="musicartists.html" class="musicArtistsTab"><iron-icon icon="music-note"></iron-icon>${TabArtists}</a>
+                <a href="songs.html" class="musicSongsTab"><iron-icon icon="music-note"></iron-icon>${TabSongs}</a>
+                <a href="musicgenres.html" class="ui-btn-active"><iron-icon icon="library-music"></iron-icon>${TabGenres}</a>
+                <a href="musicvideos.html"><iron-icon icon="video-library"></iron-icon>${TabMusicVideos}</a>
             </div>
         </div>
         <div id="artistTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="musicrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-                <a href="musicalbums.html"><i class="material-icons">album</i>${TabAlbums}</a>
-                <a href="musicalbumartists.html"><i class="material-icons">music_note</i>${TabAlbumArtists}</a>
-                <a href="musicartists.html" class="ui-btn-active musicArtistsTab"><i class="material-icons">music_note</i>${TabArtists}</a>
-                <a href="songs.html" class="musicSongsTab"><i class="material-icons">music_note</i>${TabSongs}</a>
-                <a href="musicgenres.html"><i class="material-icons">library_music</i>${TabGenres}</a>
-                <a href="musicvideos.html"><i class="material-icons">video_library</i>${TabMusicVideos}</a>
+                <a href="musicrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+                <a href="musicalbums.html"><iron-icon icon="album"></iron-icon>${TabAlbums}</a>
+                <a href="musicalbumartists.html"><iron-icon icon="music-note"></iron-icon>${TabAlbumArtists}</a>
+                <a href="musicartists.html" class="ui-btn-active musicArtistsTab"><iron-icon icon="music-note"></iron-icon>${TabArtists}</a>
+                <a href="songs.html" class="musicSongsTab"><iron-icon icon="music-note"></iron-icon>${TabSongs}</a>
+                <a href="musicgenres.html"><iron-icon icon="library-music"></iron-icon>${TabGenres}</a>
+                <a href="musicvideos.html"><iron-icon icon="video-library"></iron-icon>${TabMusicVideos}</a>
             </div>
         </div>
         <div id="gameGenreTabs" class="itemTabs" style="display: none;">
diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html
index 78600097e..faba217ed 100644
--- a/dashboard-ui/itemdetails.html
+++ b/dashboard-ui/itemdetails.html
@@ -8,10 +8,10 @@
 
         <div class="itemTabs homeTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="index.html" class="lnkHomeHome"><i class="material-icons">home</i>${TabHome}</a>
-                <a href="index.html?tab=1" class="lnkHomeNextUp"><i class="material-icons">navigate_next</i>${TabNextUp}</a>
-                <a href="index.html?tab=2" class="lnkHomeFavorites"><i class="material-icons">favorite</i>${TabFavorites}</a>
-                <a href="index.html?tab=3" class="lnkHomeUpcoming"><i class="material-icons">schedule</i>${TabUpcoming}</a>
+                <a href="index.html" class="lnkHomeHome"><iron-icon icon="home"></iron-icon>${TabHome}</a>
+                <a href="index.html?tab=1" class="lnkHomeNextUp"><iron-icon icon="navigate-next"></iron-icon>${TabNextUp}</a>
+                <a href="index.html?tab=2" class="lnkHomeFavorites"><iron-icon icon="favorite"></iron-icon>${TabFavorites}</a>
+                <a href="index.html?tab=3" class="lnkHomeUpcoming"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
             </div>
         </div>
 
@@ -30,65 +30,65 @@
 
         <div id="movieTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="moviesrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-                <a href="movies.html" class="lnkMovies"><i class="material-icons">local_movies</i>${TabMovies}</a>
-                <a href="movietrailers.html" class="movieTrailersTab lnkMovieTrailers"><i class="material-icons">movie</i>${TabTrailers}</a>
-                <a href="collections.html?context=movies" class="lnkCollections"><i class="material-icons">video_library</i>${TabCollections}</a>
-                <a href="moviegenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-                <a href="moviepeople.html" class="moviePeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-                <a href="moviestudios.html" class="movieStudiosTab"><i class="material-icons">account_box</i>${TabStudios}</a>
+                <a href="moviesrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+                <a href="movies.html" class="lnkMovies"><iron-icon icon="local-movies"></iron-icon>${TabMovies}</a>
+                <a href="movietrailers.html" class="movieTrailersTab lnkMovieTrailers"><iron-icon icon="movie"></iron-icon>${TabTrailers}</a>
+                <a href="collections.html?context=movies" class="lnkCollections"><iron-icon icon="video-library"></iron-icon>${TabCollections}</a>
+                <a href="moviegenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+                <a href="moviepeople.html" class="moviePeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+                <a href="moviestudios.html" class="movieStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabStudios}</a>
             </div>
         </div>
         <div class="itemTabs photoTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="photos.html" class="ui-btn-active lnkPhotoAlbums"><i class="material-icons">photo_album</i>${TabAlbums}</a>
-                <a href="photos.html?context=photos-photos" class="lnkPhotos"><i class="material-icons">photo</i>${TabPhotos}</a>
-                <a href="photos.html?context=photos-videos" class="lnkVideos"><i class="material-icons">videocam</i>${TabVideos}</a>
+                <a href="photos.html" class="ui-btn-active lnkPhotoAlbums"><iron-icon icon="photo-album"></iron-icon>${TabAlbums}</a>
+                <a href="photos.html?context=photos-photos" class="lnkPhotos"><iron-icon icon="photo"></iron-icon>${TabPhotos}</a>
+                <a href="photos.html?context=photos-videos" class="lnkVideos"><iron-icon icon="videocam"></iron-icon>${TabVideos}</a>
             </div>
         </div>
         <div id="tvShowsTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="tvrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-                <a href="tvlatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a>
-                <a href="tvupcoming.html"><i class="material-icons">schedule</i>${TabUpcoming}</a>
-                <a href="tvshows.html" class="ui-btn-active"><i class="material-icons">live_tv</i>${TabShows}</a>
-                <a href="episodes.html" class="tvEpisodesTab"><i class="material-icons">slideshow</i>${TabEpisodes}</a>
-                <a href="tvgenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-                <a href="tvpeople.html" class="tvPeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-                <a href="tvstudios.html" class="tvStudiosTab"><i class="material-icons">account_box</i>${TabNetworks}</a>
+                <a href="tvrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+                <a href="tvlatest.html"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
+                <a href="tvupcoming.html"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
+                <a href="tvshows.html" class="ui-btn-active"><iron-icon icon="live-tv"></iron-icon>${TabShows}</a>
+                <a href="episodes.html" class="tvEpisodesTab"><iron-icon icon="slideshow"></iron-icon>${TabEpisodes}</a>
+                <a href="tvgenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+                <a href="tvpeople.html" class="tvPeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+                <a href="tvstudios.html" class="tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
             </div>
         </div>
         <div id="songTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="musicrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-                <a href="musicalbums.html"><i class="material-icons">album</i>${TabAlbums}</a>
-                <a href="musicalbumartists.html"><i class="material-icons">music_note</i>${TabAlbumArtists}</a>
-                <a href="musicartists.html" class="musicArtistsTab"><i class="material-icons">music_note</i>${TabArtists}</a>
-                <a href="songs.html" class="ui-btn-active musicSongsTab"><i class="material-icons">music_note</i>${TabSongs}</a>
-                <a href="musicgenres.html"><i class="material-icons">library_music</i>${TabGenres}</a>
-                <a href="musicvideos.html"><i class="material-icons">video_library</i>${TabMusicVideos}</a>
+                <a href="musicrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+                <a href="musicalbums.html"><iron-icon icon="album"></iron-icon>${TabAlbums}</a>
+                <a href="musicalbumartists.html"><iron-icon icon="music-note"></iron-icon>${TabAlbumArtists}</a>
+                <a href="musicartists.html" class="musicArtistsTab"><iron-icon icon="music-note"></iron-icon>${TabArtists}</a>
+                <a href="songs.html" class="ui-btn-active musicSongsTab"><iron-icon icon="music-note"></iron-icon>${TabSongs}</a>
+                <a href="musicgenres.html"><iron-icon icon="library-music"></iron-icon>${TabGenres}</a>
+                <a href="musicvideos.html"><iron-icon icon="video-library"></iron-icon>${TabMusicVideos}</a>
             </div>
         </div>
         <div id="albumTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="musicrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-                <a href="musicalbums.html" class="ui-btn-active"><i class="material-icons">album</i>${TabAlbums}</a>
-                <a href="musicalbumartists.html"><i class="material-icons">music_note</i>${TabAlbumArtists}</a>
-                <a href="musicartists.html" class="musicArtistsTab"><i class="material-icons">music_note</i>${TabArtists}</a>
-                <a href="songs.html" class="musicSongsTab"><i class="material-icons">music_note</i>${TabSongs}</a>
-                <a href="musicgenres.html"><i class="material-icons">library_music</i>${TabGenres}</a>
-                <a href="musicvideos.html"><i class="material-icons">video_library</i>${TabMusicVideos}</a>
+                <a href="musicrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+                <a href="musicalbums.html" class="ui-btn-active"><iron-icon icon="album"></iron-icon>${TabAlbums}</a>
+                <a href="musicalbumartists.html"><iron-icon icon="music-note"></iron-icon>${TabAlbumArtists}</a>
+                <a href="musicartists.html" class="musicArtistsTab"><iron-icon icon="music-note"></iron-icon>${TabArtists}</a>
+                <a href="songs.html" class="musicSongsTab"><iron-icon icon="music-note"></iron-icon>${TabSongs}</a>
+                <a href="musicgenres.html"><iron-icon icon="library-music"></iron-icon>${TabGenres}</a>
+                <a href="musicvideos.html"><iron-icon icon="video-library"></iron-icon>${TabMusicVideos}</a>
             </div>
         </div>
         <div id="musicVideoTabs" class="itemTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="musicrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
+                <a href="musicrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
                 <a href="musicalbums.html">${TabAlbums}</a>
-                <a href="musicalbumartists.html"><i class="material-icons">music_note</i>${TabAlbumArtists}</a>
-                <a href="musicartists.html" class="musicArtistsTab"><i class="material-icons">music_note</i>${TabArtists}</a>
-                <a href="songs.html" class="musicSongsTab"><i class="material-icons">music_note</i>${TabSongs}</a>
-                <a href="musicgenres.html"><i class="material-icons">library_music</i>${TabGenres}</a>
-                <a href="musicvideos.html" class="ui-btn-active"><i class="material-icons">video_library</i>${TabMusicVideos}</a>
+                <a href="musicalbumartists.html"><iron-icon icon="music-note"></iron-icon>${TabAlbumArtists}</a>
+                <a href="musicartists.html" class="musicArtistsTab"><iron-icon icon="music-note"></iron-icon>${TabArtists}</a>
+                <a href="songs.html" class="musicSongsTab"><iron-icon icon="music-note"></iron-icon>${TabSongs}</a>
+                <a href="musicgenres.html"><iron-icon icon="library-music"></iron-icon>${TabGenres}</a>
+                <a href="musicvideos.html" class="ui-btn-active"><iron-icon icon="video-library"></iron-icon>${TabMusicVideos}</a>
             </div>
         </div>
         <div id="gameTabs" class="itemTabs" style="display: none;">
@@ -111,8 +111,8 @@
         </div>
         <div class="itemTabs channelTabs" style="display: none;">
             <div class="libraryViewNav scopedLibraryViewNav">
-                <a href="channelslatest.html" class="latestChannelItemsTab"><i class="material-icons">new_releases</i>${TabLatest}</a>
-                <a href="channels.html" class="ui-btn-active"><i class="material-icons">live_tv</i>${TabChannels}</a>
+                <a href="channelslatest.html" class="latestChannelItemsTab"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
+                <a href="channels.html" class="ui-btn-active"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
             </div>
         </div>
 
diff --git a/dashboard-ui/livetvchannel.html b/dashboard-ui/livetvchannel.html
index 61dd36bbb..232ae2956 100644
--- a/dashboard-ui/livetvchannel.html
+++ b/dashboard-ui/livetvchannel.html
@@ -6,12 +6,12 @@
 <body>
     <div id="liveTvChannelPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvcomponents,scripts/livetvchannel,paperbuttonstyle,livetvcss">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="livetvguide.html"><i class="material-icons">grid_on</i>${TabGuide}</a>
-            <a href="livetvchannels.html" class="ui-btn-active"><i class="material-icons">live_tv</i>${TabChannels}</a>
-            <a href="livetvrecordings.html"><i class="material-icons">slideshow</i>${TabRecordings}</a>
-            <a href="livetvtimers.html"><i class="material-icons">schedule</i>${TabScheduled}</a>
-            <a href="livetvseriestimers.html"><i class="material-icons">refresh</i>${TabSeries}</a>
+            <a href="livetvsuggested.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="livetvguide.html"><iron-icon icon="grid-on"></iron-icon>${TabGuide}</a>
+            <a href="livetvchannels.html" class="ui-btn-active"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
+            <a href="livetvrecordings.html"><iron-icon icon="slideshow"></iron-icon>${TabRecordings}</a>
+            <a href="livetvtimers.html"><iron-icon icon="schedule"></iron-icon>${TabScheduled}</a>
+            <a href="livetvseriestimers.html"><iron-icon icon="refresh"></iron-icon>${TabSeries}</a>
         </div>
         <table class="detailPageContent primaryDetailPageContent">
             <tr>
diff --git a/dashboard-ui/livetvchannels.html b/dashboard-ui/livetvchannels.html
index 8665852bf..8b2e4bdd9 100644
--- a/dashboard-ui/livetvchannels.html
+++ b/dashboard-ui/livetvchannels.html
@@ -6,12 +6,12 @@
 <body>
     <div id="liveTvChannelsPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvchannels,livetvcss">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="livetvguide.html"><i class="material-icons">grid_on</i>${TabGuide}</a>
-            <a href="livetvchannels.html" class="ui-btn-active"><i class="material-icons">live_tv</i>${TabChannels}</a>
-            <a href="livetvrecordings.html"><i class="material-icons">slideshow</i>${TabRecordings}</a>
-            <a href="livetvtimers.html"><i class="material-icons">schedule</i>${TabScheduled}</a>
-            <a href="livetvseriestimers.html"><i class="material-icons">refresh</i>${TabSeries}</a>
+            <a href="livetvsuggested.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="livetvguide.html"><iron-icon icon="grid-on"></iron-icon>${TabGuide}</a>
+            <a href="livetvchannels.html" class="ui-btn-active"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
+            <a href="livetvrecordings.html"><iron-icon icon="slideshow"></iron-icon>${TabRecordings}</a>
+            <a href="livetvtimers.html"><iron-icon icon="schedule"></iron-icon>${TabScheduled}</a>
+            <a href="livetvseriestimers.html"><iron-icon icon="refresh"></iron-icon>${TabSeries}</a>
         </div>
         <div data-role="content">
             <div class="viewSettings">
diff --git a/dashboard-ui/livetvguide.html b/dashboard-ui/livetvguide.html
index f6f897193..eca998e94 100644
--- a/dashboard-ui/livetvguide.html
+++ b/dashboard-ui/livetvguide.html
@@ -6,12 +6,12 @@
 <body>
     <div id="liveTvGuidePage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}" data-require="scripts/registrationservices,scripts/livetvcomponents,scripts/livetvguide,paperbuttonstyle,livetvcss">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="livetvguide.html" class="ui-btn-active"><i class="material-icons">grid_on</i>${TabGuide}</a>
-            <a href="livetvchannels.html"><i class="material-icons">live_tv</i>${TabChannels}</a>
-            <a href="livetvrecordings.html"><i class="material-icons">slideshow</i>${TabRecordings}</a>
-            <a href="livetvtimers.html"><i class="material-icons">schedule</i>${TabScheduled}</a>
-            <a href="livetvseriestimers.html"><i class="material-icons">refresh</i>${TabSeries}</a>
+            <a href="livetvsuggested.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="livetvguide.html" class="ui-btn-active"><iron-icon icon="grid-on"></iron-icon>${TabGuide}</a>
+            <a href="livetvchannels.html"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
+            <a href="livetvrecordings.html"><iron-icon icon="slideshow"></iron-icon>${TabRecordings}</a>
+            <a href="livetvtimers.html"><iron-icon icon="schedule"></iron-icon>${TabScheduled}</a>
+            <a href="livetvseriestimers.html"><iron-icon icon="refresh"></iron-icon>${TabSeries}</a>
         </div>
         <div data-role="content" style="padding-top: 5px;padding-left:0!important;padding-right:0!important;">
 
diff --git a/dashboard-ui/livetvitems.html b/dashboard-ui/livetvitems.html
index 4f59d5902..2f214c9de 100644
--- a/dashboard-ui/livetvitems.html
+++ b/dashboard-ui/livetvitems.html
@@ -6,12 +6,12 @@
 <body>
     <div id="liveTvItemsPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvitems,scripts/queryfilters,livetvcss">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html" class="ui-btn-active"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="livetvguide.html"><i class="material-icons">grid_on</i>${TabGuide}</a>
-            <a href="livetvchannels.html"><i class="material-icons">live_tv</i>${TabChannels}</a>
-            <a href="livetvrecordings.html"><i class="material-icons">slideshow</i>${TabRecordings}</a>
-            <a href="livetvtimers.html"><i class="material-icons">schedule</i>${TabScheduled}</a>
-            <a href="livetvseriestimers.html"><i class="material-icons">refresh</i>${TabSeries}</a>
+            <a href="livetvsuggested.html" class="ui-btn-active"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="livetvguide.html"><iron-icon icon="grid-on"></iron-icon>${TabGuide}</a>
+            <a href="livetvchannels.html"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
+            <a href="livetvrecordings.html"><iron-icon icon="slideshow"></iron-icon>${TabRecordings}</a>
+            <a href="livetvtimers.html"><iron-icon icon="schedule"></iron-icon>${TabScheduled}</a>
+            <a href="livetvseriestimers.html"><iron-icon icon="refresh"></iron-icon>${TabSeries}</a>
         </div>
         <div data-role="content">
             <div class="viewSettings">
diff --git a/dashboard-ui/livetvnewrecording.html b/dashboard-ui/livetvnewrecording.html
index 5721965ed..20591409e 100644
--- a/dashboard-ui/livetvnewrecording.html
+++ b/dashboard-ui/livetvnewrecording.html
@@ -6,12 +6,12 @@
 <body>
     <div id="liveTvNewRecordingPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvcomponents,scripts/livetvnewrecording,livetvcss">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="livetvguide.html"><i class="material-icons">grid_on</i>${TabGuide}</a>
-            <a href="livetvchannels.html"><i class="material-icons">live_tv</i>${TabChannels}</a>
-            <a href="livetvrecordings.html" class="ui-btn-active"><i class="material-icons">slideshow</i>${TabRecordings}</a>
-            <a href="livetvtimers.html"><i class="material-icons">schedule</i>${TabScheduled}</a>
-            <a href="livetvseriestimers.html"><i class="material-icons">refresh</i>${TabSeries}</a>
+            <a href="livetvsuggested.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="livetvguide.html"><iron-icon icon="grid-on"></iron-icon>${TabGuide}</a>
+            <a href="livetvchannels.html"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
+            <a href="livetvrecordings.html" class="ui-btn-active"><iron-icon icon="slideshow"></iron-icon>${TabRecordings}</a>
+            <a href="livetvtimers.html"><iron-icon icon="schedule"></iron-icon>${TabScheduled}</a>
+            <a href="livetvseriestimers.html"><iron-icon icon="refresh"></iron-icon>${TabSeries}</a>
         </div>
         <div data-role="content">
             <form class="liveTvNewRecordingForm" style="margin: 0 auto;">
diff --git a/dashboard-ui/livetvprogram.html b/dashboard-ui/livetvprogram.html
index c519ac0ed..06c8b9a4f 100644
--- a/dashboard-ui/livetvprogram.html
+++ b/dashboard-ui/livetvprogram.html
@@ -6,12 +6,12 @@
 <body>
     <div id="liveTvProgramPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvcomponents,scripts/livetvprogram,livetvcss">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="livetvguide.html"><i class="material-icons">grid_on</i>${TabGuide}</a>
-            <a href="livetvchannels.html" class="ui-btn-active"><i class="material-icons">live_tv</i>${TabChannels}</a>
-            <a href="livetvrecordings.html"><i class="material-icons">slideshow</i>${TabRecordings}</a>
-            <a href="livetvtimers.html"><i class="material-icons">schedule</i>${TabScheduled}</a>
-            <a href="livetvseriestimers.html"><i class="material-icons">refresh</i>${TabSeries}</a>
+            <a href="livetvsuggested.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="livetvguide.html"><iron-icon icon="grid-on"></iron-icon>${TabGuide}</a>
+            <a href="livetvchannels.html" class="ui-btn-active"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
+            <a href="livetvrecordings.html"><iron-icon icon="slideshow"></iron-icon>${TabRecordings}</a>
+            <a href="livetvtimers.html"><iron-icon icon="schedule"></iron-icon>${TabScheduled}</a>
+            <a href="livetvseriestimers.html"><iron-icon icon="refresh"></iron-icon>${TabSeries}</a>
         </div>
         <div style="padding: 1em 0;">
             <div>
diff --git a/dashboard-ui/livetvrecording.html b/dashboard-ui/livetvrecording.html
index e86e90a65..136d06c99 100644
--- a/dashboard-ui/livetvrecording.html
+++ b/dashboard-ui/livetvrecording.html
@@ -6,12 +6,12 @@
 <body>
     <div id="liveTvRecordingPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvcomponents,scripts/livetvrecording,paperbuttonstyle,livetvcss">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="livetvguide.html"><i class="material-icons">grid_on</i>${TabGuide}</a>
-            <a href="livetvchannels.html"><i class="material-icons">live_tv</i>${TabChannels}</a>
-            <a href="livetvrecordings.html" class="ui-btn-active"><i class="material-icons">slideshow</i>${TabRecordings}</a>
-            <a href="livetvtimers.html"><i class="material-icons">schedule</i>${TabScheduled}</a>
-            <a href="livetvseriestimers.html"><i class="material-icons">refresh</i>${TabSeries}</a>
+            <a href="livetvsuggested.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="livetvguide.html"><iron-icon icon="grid-on"></iron-icon>${TabGuide}</a>
+            <a href="livetvchannels.html"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
+            <a href="livetvrecordings.html" class="ui-btn-active"><iron-icon icon="slideshow"></iron-icon>${TabRecordings}</a>
+            <a href="livetvtimers.html"><iron-icon icon="schedule"></iron-icon>${TabScheduled}</a>
+            <a href="livetvseriestimers.html"><iron-icon icon="refresh"></iron-icon>${TabSeries}</a>
         </div>
         <div style="padding: 1em 0;">
             <div>
diff --git a/dashboard-ui/livetvrecordinglist.html b/dashboard-ui/livetvrecordinglist.html
index 24ba446b4..4856c42db 100644
--- a/dashboard-ui/livetvrecordinglist.html
+++ b/dashboard-ui/livetvrecordinglist.html
@@ -6,12 +6,12 @@
 <body>
     <div id="liveTvRecordingListPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvrecordinglist,livetvcss">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="livetvguide.html"><i class="material-icons">grid_on</i>${TabGuide}</a>
-            <a href="livetvchannels.html"><i class="material-icons">live_tv</i>${TabChannels}</a>
-            <a href="livetvrecordings.html" class="ui-btn-active"><i class="material-icons">slideshow</i>${TabRecordings}</a>
-            <a href="livetvtimers.html"><i class="material-icons">schedule</i>${TabScheduled}</a>
-            <a href="livetvseriestimers.html"><i class="material-icons">refresh</i>${TabSeries}</a>
+            <a href="livetvsuggested.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="livetvguide.html"><iron-icon icon="grid-on"></iron-icon>${TabGuide}</a>
+            <a href="livetvchannels.html"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
+            <a href="livetvrecordings.html" class="ui-btn-active"><iron-icon icon="slideshow"></iron-icon>${TabRecordings}</a>
+            <a href="livetvtimers.html"><iron-icon icon="schedule"></iron-icon>${TabScheduled}</a>
+            <a href="livetvseriestimers.html"><iron-icon icon="refresh"></iron-icon>${TabSeries}</a>
         </div>
         <div data-role="content">
             <div class="viewSettings" style="margin:.5em 0;">
diff --git a/dashboard-ui/livetvrecordings.html b/dashboard-ui/livetvrecordings.html
index e65b502a9..9900b36e6 100644
--- a/dashboard-ui/livetvrecordings.html
+++ b/dashboard-ui/livetvrecordings.html
@@ -7,12 +7,12 @@
     <div id="liveTvRecordingsPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvrecordings,paperbuttonstyle,livetvcss">
 
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="livetvguide.html"><i class="material-icons">grid_on</i>${TabGuide}</a>
-            <a href="livetvchannels.html"><i class="material-icons">live_tv</i>${TabChannels}</a>
-            <a href="livetvrecordings.html" class="ui-btn-active"><i class="material-icons">slideshow</i>${TabRecordings}</a>
-            <a href="livetvtimers.html"><i class="material-icons">schedule</i>${TabScheduled}</a>
-            <a href="livetvseriestimers.html"><i class="material-icons">refresh</i>${TabSeries}</a>
+            <a href="livetvsuggested.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="livetvguide.html"><iron-icon icon="grid-on"></iron-icon>${TabGuide}</a>
+            <a href="livetvchannels.html"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
+            <a href="livetvrecordings.html" class="ui-btn-active"><iron-icon icon="slideshow"></iron-icon>${TabRecordings}</a>
+            <a href="livetvtimers.html"><iron-icon icon="schedule"></iron-icon>${TabScheduled}</a>
+            <a href="livetvseriestimers.html"><iron-icon icon="refresh"></iron-icon>${TabSeries}</a>
         </div>
         <div data-role="content">
             <div class="ehsContent">
diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html
index 4c76736f6..34649212d 100644
--- a/dashboard-ui/livetvseriestimer.html
+++ b/dashboard-ui/livetvseriestimer.html
@@ -6,12 +6,12 @@
 <body>
     <div id="liveTvSeriesTimerPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvcomponents,scripts/livetvseriestimer,livetvcss">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="livetvguide.html"><i class="material-icons">grid_on</i>${TabGuide}</a>
-            <a href="livetvchannels.html"><i class="material-icons">live_tv</i>${TabChannels}</a>
-            <a href="livetvrecordings.html"><i class="material-icons">slideshow</i>${TabRecordings}</a>
-            <a href="livetvtimers.html"><i class="material-icons">schedule</i>${TabScheduled}</a>
-            <a href="livetvseriestimers.html" class="ui-btn-active"><i class="material-icons">refresh</i>${TabSeries}</a>
+            <a href="livetvsuggested.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="livetvguide.html"><iron-icon icon="grid-on"></iron-icon>${TabGuide}</a>
+            <a href="livetvchannels.html"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
+            <a href="livetvrecordings.html"><iron-icon icon="slideshow"></iron-icon>${TabRecordings}</a>
+            <a href="livetvtimers.html"><iron-icon icon="schedule"></iron-icon>${TabScheduled}</a>
+            <a href="livetvseriestimers.html" class="ui-btn-active"><iron-icon icon="refresh"></iron-icon>${TabSeries}</a>
         </div>
         <div data-role="content">
             <form class="liveTvSeriesTimerForm" style="margin: 0 auto; max-width: 720px;">
diff --git a/dashboard-ui/livetvseriestimers.html b/dashboard-ui/livetvseriestimers.html
index 19cf7b3ca..46c3bde1c 100644
--- a/dashboard-ui/livetvseriestimers.html
+++ b/dashboard-ui/livetvseriestimers.html
@@ -6,12 +6,12 @@
 <body>
     <div id="liveTvSeriesTimersPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvseriestimers,livetvcss">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="livetvguide.html"><i class="material-icons">grid_on</i>${TabGuide}</a>
-            <a href="livetvchannels.html"><i class="material-icons">live_tv</i>${TabChannels}</a>
-            <a href="livetvrecordings.html"><i class="material-icons">slideshow</i>${TabRecordings}</a>
-            <a href="livetvtimers.html"><i class="material-icons">schedule</i>${TabScheduled}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">refresh</i>${TabSeries}</a>
+            <a href="livetvsuggested.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="livetvguide.html"><iron-icon icon="grid-on"></iron-icon>${TabGuide}</a>
+            <a href="livetvchannels.html"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
+            <a href="livetvrecordings.html"><iron-icon icon="slideshow"></iron-icon>${TabRecordings}</a>
+            <a href="livetvtimers.html"><iron-icon icon="schedule"></iron-icon>${TabScheduled}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="refresh"></iron-icon>${TabSeries}</a>
         </div>
         <div data-role="content">
             <div style="max-width: 600px; margin: 0 auto;">
diff --git a/dashboard-ui/livetvsuggested.html b/dashboard-ui/livetvsuggested.html
index 3c674895c..fa55ca178 100644
--- a/dashboard-ui/livetvsuggested.html
+++ b/dashboard-ui/livetvsuggested.html
@@ -7,12 +7,12 @@
     <div id="liveTvSuggestedPage" data-role="page" class="page libraryPage liveTvPage backdropPage globalBackdropPage" data-contextname="${HeaderLiveTv}" data-backdroptype="series,movie" data-require="scripts/livetvsuggested,paperbuttonstyle,livetvcss">
 
         <div class="libraryViewNav">
-            <a href="#" class="ui-btn-active"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="livetvguide.html"><i class="material-icons">grid_on</i>${TabGuide}</a>
-            <a href="livetvchannels.html"><i class="material-icons">live_tv</i>${TabChannels}</a>
-            <a href="livetvrecordings.html"><i class="material-icons">slideshow</i>${TabRecordings}</a>
-            <a href="livetvtimers.html"><i class="material-icons">schedule</i>${TabScheduled}</a>
-            <a href="livetvseriestimers.html"><i class="material-icons">refresh</i>${TabSeries}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="livetvguide.html"><iron-icon icon="grid-on"></iron-icon>${TabGuide}</a>
+            <a href="livetvchannels.html"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
+            <a href="livetvrecordings.html"><iron-icon icon="slideshow"></iron-icon>${TabRecordings}</a>
+            <a href="livetvtimers.html"><iron-icon icon="schedule"></iron-icon>${TabScheduled}</a>
+            <a href="livetvseriestimers.html"><iron-icon icon="refresh"></iron-icon>${TabSeries}</a>
         </div>
         <div data-role="content">
             <div class="ehsContent">
diff --git a/dashboard-ui/livetvtimer.html b/dashboard-ui/livetvtimer.html
index bd17992b6..a285e1d9f 100644
--- a/dashboard-ui/livetvtimer.html
+++ b/dashboard-ui/livetvtimer.html
@@ -6,12 +6,12 @@
 <body>
     <div id="liveTvTimerPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvcomponents,scripts/livetvtimer,livetvcss">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="livetvguide.html"><i class="material-icons">grid_on</i>${TabGuide}</a>
-            <a href="livetvchannels.html"><i class="material-icons">live_tv</i>${TabChannels}</a>
-            <a href="livetvrecordings.html"><i class="material-icons">slideshow</i>${TabRecordings}</a>
-            <a href="livetvtimers.html" class="ui-btn-active"><i class="material-icons">schedule</i>${TabScheduled}</a>
-            <a href="livetvseriestimers.html"><i class="material-icons">refresh</i>${TabSeries}</a>
+            <a href="livetvsuggested.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="livetvguide.html"><iron-icon icon="grid-on"></iron-icon>${TabGuide}</a>
+            <a href="livetvchannels.html"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
+            <a href="livetvrecordings.html"><iron-icon icon="slideshow"></iron-icon>${TabRecordings}</a>
+            <a href="livetvtimers.html" class="ui-btn-active"><iron-icon icon="schedule"></iron-icon>${TabScheduled}</a>
+            <a href="livetvseriestimers.html"><iron-icon icon="refresh"></iron-icon>${TabSeries}</a>
         </div>
         <div data-role="content">
 
diff --git a/dashboard-ui/livetvtimers.html b/dashboard-ui/livetvtimers.html
index 44051f32c..06cc89b7d 100644
--- a/dashboard-ui/livetvtimers.html
+++ b/dashboard-ui/livetvtimers.html
@@ -6,12 +6,12 @@
 <body>
     <div id="liveTvTimersPage" data-role="page" class="page libraryPage liveTvPage" data-contextname="${HeaderLiveTv}" data-require="scripts/livetvtimers,livetvcss">
         <div class="libraryViewNav">
-            <a href="livetvsuggested.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="livetvguide.html"><i class="material-icons">grid_on</i>${TabGuide}</a>
-            <a href="livetvchannels.html"><i class="material-icons">live_tv</i>${TabChannels}</a>
-            <a href="livetvrecordings.html"><i class="material-icons">slideshow</i>${TabRecordings}</a>
-            <a href="livetvtimers.html" class="ui-btn-active"><i class="material-icons">schedule</i>${TabScheduled}</a>
-            <a href="livetvseriestimers.html"><i class="material-icons">refresh</i>${TabSeries}</a>
+            <a href="livetvsuggested.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="livetvguide.html"><iron-icon icon="grid-on"></iron-icon>${TabGuide}</a>
+            <a href="livetvchannels.html"><iron-icon icon="live-tv"></iron-icon>${TabChannels}</a>
+            <a href="livetvrecordings.html"><iron-icon icon="slideshow"></iron-icon>${TabRecordings}</a>
+            <a href="livetvtimers.html" class="ui-btn-active"><iron-icon icon="schedule"></iron-icon>${TabScheduled}</a>
+            <a href="livetvseriestimers.html"><iron-icon icon="refresh"></iron-icon>${TabSeries}</a>
         </div>
         <div data-role="content">
             <div style="max-width: 600px; margin: 0 auto;">
diff --git a/dashboard-ui/moviegenres.html b/dashboard-ui/moviegenres.html
index 30e98dca0..499a4d6fb 100644
--- a/dashboard-ui/moviegenres.html
+++ b/dashboard-ui/moviegenres.html
@@ -7,13 +7,13 @@
     <div id="movieGenresPage" data-role="page" class="page libraryPage" data-require="scripts/moviegenres">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="moviesrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="movies.html"><i class="material-icons">local_movies</i>${TabMovies}</a>
-            <a href="movietrailers.html" class="movieTrailersTab"><i class="material-icons">movie</i>${TabTrailers}</a>
-            <a href="collections.html?context=movies"><i class="material-icons">video_library</i>${TabCollections}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">video_library</i>${TabGenres}</a>
-            <a href="moviepeople.html" class="moviePeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-            <a href="moviestudios.html" class="movieStudiosTab"><i class="material-icons">account_box</i>${TabStudios}</a>
+            <a href="moviesrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="movies.html"><iron-icon icon="local-movies"></iron-icon>${TabMovies}</a>
+            <a href="movietrailers.html" class="movieTrailersTab"><iron-icon icon="movie"></iron-icon>${TabTrailers}</a>
+            <a href="collections.html?context=movies"><iron-icon icon="video-library"></iron-icon>${TabCollections}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+            <a href="moviepeople.html" class="moviePeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+            <a href="moviestudios.html" class="movieStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabStudios}</a>
         </div>
 
         <div data-role="content">
diff --git a/dashboard-ui/moviepeople.html b/dashboard-ui/moviepeople.html
index 659031573..1e2c5d21a 100644
--- a/dashboard-ui/moviepeople.html
+++ b/dashboard-ui/moviepeople.html
@@ -7,13 +7,13 @@
     <div id="moviePeoplePage" data-role="page" class="page libraryPage" data-require="scripts/moviepeople">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="moviesrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="movies.html"><i class="material-icons">local_movies</i>${TabMovies}</a>
-            <a href="movietrailers.html" class="movieTrailersTab"><i class="material-icons">movie</i>${TabTrailers}</a>
-            <a href="collections.html?context=movies"><i class="material-icons">video_library</i>${TabCollections}</a>
-            <a href="moviegenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">people</i>${TabPeople}</a>
-            <a href="moviestudios.html" class="movieStudiosTab"><i class="material-icons">account_box</i>${TabStudios}</a>
+            <a href="moviesrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="movies.html"><iron-icon icon="local-movies"></iron-icon>${TabMovies}</a>
+            <a href="movietrailers.html" class="movieTrailersTab"><iron-icon icon="movie"></iron-icon>${TabTrailers}</a>
+            <a href="collections.html?context=movies"><iron-icon icon="video-library"></iron-icon>${TabCollections}</a>
+            <a href="moviegenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+            <a href="moviestudios.html" class="movieStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabStudios}</a>
         </div>
 
         <div class="alphabetPicker">
diff --git a/dashboard-ui/movies.html b/dashboard-ui/movies.html
index 014584a0a..b6f962b8e 100644
--- a/dashboard-ui/movies.html
+++ b/dashboard-ui/movies.html
@@ -7,13 +7,13 @@
     <div id="moviesPage" data-role="page" class="page libraryPage collectionEditorPage" data-require="scripts/movies,scripts/queryfilters">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="moviesrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">local_movies</i>${TabMovies}</a>
-            <a href="movietrailers.html" class="movieTrailersTab"><i class="material-icons">movie</i>${TabTrailers}</a>
-            <a href="collections.html?context=movies"><i class="material-icons">video_library</i>${TabCollections}</a>
-            <a href="moviegenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-            <a href="moviepeople.html" class="moviePeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-            <a href="moviestudios.html" class="movieStudiosTab"><i class="material-icons">account_box</i>${TabStudios}</a>
+            <a href="moviesrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="local-movies"></iron-icon>${TabMovies}</a>
+            <a href="movietrailers.html" class="movieTrailersTab"><iron-icon icon="movie"></iron-icon>${TabTrailers}</a>
+            <a href="collections.html?context=movies"><iron-icon icon="video-library"></iron-icon>${TabCollections}</a>
+            <a href="moviegenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+            <a href="moviepeople.html" class="moviePeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+            <a href="moviestudios.html" class="movieStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabStudios}</a>
         </div>
 
         <div class="alphabetPicker">
diff --git a/dashboard-ui/moviesrecommended.html b/dashboard-ui/moviesrecommended.html
index 24ba33717..df1c70cb5 100644
--- a/dashboard-ui/moviesrecommended.html
+++ b/dashboard-ui/moviesrecommended.html
@@ -7,13 +7,13 @@
     <div id="moviesRecommendedPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="movie" data-require="scripts/moviesrecommended,paperbuttonstyle">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="#" class="ui-btn-active"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="movies.html"><i class="material-icons">local_movies</i>${TabMovies}</a>
-            <a href="movietrailers.html" class="movieTrailersTab"><i class="material-icons">movie</i>${TabTrailers}</a>
-            <a href="collections.html?context=movies"><i class="material-icons">video_library</i>${TabCollections}</a>
-            <a href="moviegenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-            <a href="moviepeople.html" class="moviePeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-            <a href="moviestudios.html" class="movieStudiosTab"><i class="material-icons">account_box</i>${TabStudios}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="movies.html"><iron-icon icon="local-movies"></iron-icon>${TabMovies}</a>
+            <a href="movietrailers.html" class="movieTrailersTab"><iron-icon icon="movie"></iron-icon>${TabTrailers}</a>
+            <a href="collections.html?context=movies"><iron-icon icon="video-library"></iron-icon>${TabCollections}</a>
+            <a href="moviegenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+            <a href="moviepeople.html" class="moviePeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+            <a href="moviestudios.html" class="movieStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabStudios}</a>
         </div>
         <div data-role="content">
 
diff --git a/dashboard-ui/moviestudios.html b/dashboard-ui/moviestudios.html
index 5648a0726..d1f108130 100644
--- a/dashboard-ui/moviestudios.html
+++ b/dashboard-ui/moviestudios.html
@@ -7,13 +7,13 @@
     <div id="movieStudiosPage" data-role="page" class="page libraryPage" data-require="scripts/moviestudios">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="moviesrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="movies.html"><i class="material-icons">local_movies</i>${TabMovies}</a>
-            <a href="movietrailers.html" class="movieTrailersTab"><i class="material-icons">movie</i>${TabTrailers}</a>
-            <a href="collections.html?context=movies"><i class="material-icons">video_library</i>${TabCollections}</a>
-            <a href="moviegenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-            <a href="moviepeople.html" class="moviePeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">account_box</i>${TabStudios}</a>
+            <a href="moviesrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="movies.html"><iron-icon icon="local-movies"></iron-icon>${TabMovies}</a>
+            <a href="movietrailers.html" class="movieTrailersTab"><iron-icon icon="movie"></iron-icon>${TabTrailers}</a>
+            <a href="collections.html?context=movies"><iron-icon icon="video-library"></iron-icon>${TabCollections}</a>
+            <a href="moviegenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+            <a href="moviepeople.html" class="moviePeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="account-box"></iron-icon>${TabStudios}</a>
         </div>
 
         <div data-role="content">
diff --git a/dashboard-ui/movietrailers.html b/dashboard-ui/movietrailers.html
index 3416f1546..c9446526d 100644
--- a/dashboard-ui/movietrailers.html
+++ b/dashboard-ui/movietrailers.html
@@ -7,13 +7,13 @@
     <div id="movieTrailersPage" data-role="page" class="page libraryPage" data-require="scripts/movietrailers,jqmicons">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="moviesrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="movies.html"><i class="material-icons">local_movies</i>${TabMovies}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">movie</i>${TabTrailers}</a>
-            <a href="collections.html?context=movies"><i class="material-icons">video_library</i>${TabCollections}</a>
-            <a href="moviegenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-            <a href="moviepeople.html" class="moviePeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-            <a href="moviestudios.html" class="movieStudiosTab"><i class="material-icons">account_box</i>${TabStudios}</a>
+            <a href="moviesrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="movies.html"><iron-icon icon="local-movies"></iron-icon>${TabMovies}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="movie"></iron-icon>${TabTrailers}</a>
+            <a href="collections.html?context=movies"><iron-icon icon="video-library"></iron-icon>${TabCollections}</a>
+            <a href="moviegenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+            <a href="moviepeople.html" class="moviePeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+            <a href="moviestudios.html" class="movieStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabStudios}</a>
         </div>
 
         <div class="alphabetPicker">
diff --git a/dashboard-ui/musicalbumartists.html b/dashboard-ui/musicalbumartists.html
index d7d0d456c..a8a7063c8 100644
--- a/dashboard-ui/musicalbumartists.html
+++ b/dashboard-ui/musicalbumartists.html
@@ -6,13 +6,13 @@
 <body>
     <div id="musicAlbumArtistsPage" data-role="page" class="page libraryPage" data-require="scripts/musicalbumartists,scripts/queryfilters">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="musicrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="musicalbums.html"><i class="material-icons">album</i>${TabAlbums}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">music_note</i>${TabAlbumArtists}</a>
-            <a href="musicartists.html" class="musicArtistsTab"><i class="material-icons">music_note</i>${TabArtists}</a>
-            <a href="songs.html" class="musicSongsTab"><i class="material-icons">music_note</i>${TabSongs}</a>
-            <a href="musicgenres.html"><i class="material-icons">library_music</i>${TabGenres}</a>
-            <a href="musicvideos.html"><i class="material-icons">video_library</i>${TabMusicVideos}</a>
+            <a href="musicrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="musicalbums.html"><iron-icon icon="album"></iron-icon>${TabAlbums}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="music-note"></iron-icon>${TabAlbumArtists}</a>
+            <a href="musicartists.html" class="musicArtistsTab"><iron-icon icon="music-note"></iron-icon>${TabArtists}</a>
+            <a href="songs.html" class="musicSongsTab"><iron-icon icon="music-note"></iron-icon>${TabSongs}</a>
+            <a href="musicgenres.html"><iron-icon icon="library-music"></iron-icon>${TabGenres}</a>
+            <a href="musicvideos.html"><iron-icon icon="video-library"></iron-icon>${TabMusicVideos}</a>
         </div>
 
         <div class="alphabetPicker">
diff --git a/dashboard-ui/musicalbums.html b/dashboard-ui/musicalbums.html
index c2ce09d51..0e898a613 100644
--- a/dashboard-ui/musicalbums.html
+++ b/dashboard-ui/musicalbums.html
@@ -6,13 +6,13 @@
 <body>
     <div id="musicAlbumsPage" data-role="page" class="page libraryPage" data-require="scripts/musicalbums,scripts/queryfilters">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="musicrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">album</i>${TabAlbums}</a>
-            <a href="musicalbumartists.html"><i class="material-icons">music_note</i>${TabAlbumArtists}</a>
-            <a href="musicartists.html" class="musicArtistsTab"><i class="material-icons">music_note</i>${TabArtists}</a>
-            <a href="songs.html" class="musicSongsTab"><i class="material-icons">music_note</i>${TabSongs}</a>
-            <a href="musicgenres.html"><i class="material-icons">library_music</i>${TabGenres}</a>
-            <a href="musicvideos.html"><i class="material-icons">video_library</i>${TabMusicVideos}</a>
+            <a href="musicrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="album"></iron-icon>${TabAlbums}</a>
+            <a href="musicalbumartists.html"><iron-icon icon="music-note"></iron-icon>${TabAlbumArtists}</a>
+            <a href="musicartists.html" class="musicArtistsTab"><iron-icon icon="music-note"></iron-icon>${TabArtists}</a>
+            <a href="songs.html" class="musicSongsTab"><iron-icon icon="music-note"></iron-icon>${TabSongs}</a>
+            <a href="musicgenres.html"><iron-icon icon="library-music"></iron-icon>${TabGenres}</a>
+            <a href="musicvideos.html"><iron-icon icon="video-library"></iron-icon>${TabMusicVideos}</a>
         </div>
         <div class="alphabetPicker">
         </div>
diff --git a/dashboard-ui/musicartists.html b/dashboard-ui/musicartists.html
index 2d5bb7e2b..e1ca72090 100644
--- a/dashboard-ui/musicartists.html
+++ b/dashboard-ui/musicartists.html
@@ -6,13 +6,13 @@
 <body>
     <div id="musicArtistsPage" data-role="page" class="page libraryPage" data-require="scripts/musicartists,scripts/queryfilters">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="musicrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="musicalbums.html"><i class="material-icons">album</i>${TabAlbums}</a>
-            <a href="musicalbumartists.html"><i class="material-icons">music_note</i>${TabAlbumArtists}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">music_note</i>${TabArtists}</a>
-            <a href="songs.html" class="musicSongsTab"><i class="material-icons">music_note</i>${TabSongs}</a>
-            <a href="musicgenres.html"><i class="material-icons">library_music</i>${TabGenres}</a>
-            <a href="musicvideos.html"><i class="material-icons">video_library</i>${TabMusicVideos}</a>
+            <a href="musicrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="musicalbums.html"><iron-icon icon="album"></iron-icon>${TabAlbums}</a>
+            <a href="musicalbumartists.html"><iron-icon icon="music-note"></iron-icon>${TabAlbumArtists}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="music-note"></iron-icon>${TabArtists}</a>
+            <a href="songs.html" class="musicSongsTab"><iron-icon icon="music-note"></iron-icon>${TabSongs}</a>
+            <a href="musicgenres.html"><iron-icon icon="library-music"></iron-icon>${TabGenres}</a>
+            <a href="musicvideos.html"><iron-icon icon="video-library"></iron-icon>${TabMusicVideos}</a>
         </div>
 
         <div class="alphabetPicker">
diff --git a/dashboard-ui/musicgenres.html b/dashboard-ui/musicgenres.html
index 752ca07d7..b1532d35f 100644
--- a/dashboard-ui/musicgenres.html
+++ b/dashboard-ui/musicgenres.html
@@ -6,13 +6,13 @@
 <body>
     <div id="musicGenresPage" data-role="page" class="page libraryPage" data-require="scripts/musicgenres">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="musicrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="musicalbums.html"><i class="material-icons">album</i>${TabAlbums}</a>
-            <a href="musicalbumartists.html"><i class="material-icons">music_note</i>${TabAlbumArtists}</a>
-            <a href="musicartists.html" class="musicArtistsTab"><i class="material-icons">music_note</i>${TabArtists}</a>
-            <a href="songs.html" class="musicSongsTab"><i class="material-icons">music_note</i>${TabSongs}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">library_music</i>${TabGenres}</a>
-            <a href="musicvideos.html"><i class="material-icons">video_library</i>${TabMusicVideos}</a>
+            <a href="musicrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="musicalbums.html"><iron-icon icon="album"></iron-icon>${TabAlbums}</a>
+            <a href="musicalbumartists.html"><iron-icon icon="music-note"></iron-icon>${TabAlbumArtists}</a>
+            <a href="musicartists.html" class="musicArtistsTab"><iron-icon icon="music-note"></iron-icon>${TabArtists}</a>
+            <a href="songs.html" class="musicSongsTab"><iron-icon icon="music-note"></iron-icon>${TabSongs}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="library-music"></iron-icon>${TabGenres}</a>
+            <a href="musicvideos.html"><iron-icon icon="video-library"></iron-icon>${TabMusicVideos}</a>
         </div>
         <div data-role="content">
             <div class="viewSettings">
diff --git a/dashboard-ui/musicrecommended.html b/dashboard-ui/musicrecommended.html
index 4c150d637..be0967b32 100644
--- a/dashboard-ui/musicrecommended.html
+++ b/dashboard-ui/musicrecommended.html
@@ -6,13 +6,13 @@
 <body>
     <div id="musicRecommendedPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="musicartist" data-require="scripts/musicrecommended">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="#" class="ui-btn-active"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="musicalbums.html"><i class="material-icons">album</i>${TabAlbums}</a>
-            <a href="musicalbumartists.html"><i class="material-icons">music_note</i>${TabAlbumArtists}</a>
-            <a href="musicartists.html" class="musicArtistsTab"><i class="material-icons">music_note</i>${TabArtists}</a>
-            <a href="songs.html" class="musicSongsTab"><i class="material-icons">music_note</i>${TabSongs}</a>
-            <a href="musicgenres.html"><i class="material-icons">library_music</i>${TabGenres}</a>
-            <a href="musicvideos.html"><i class="material-icons">video_library</i>${TabMusicVideos}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="musicalbums.html"><iron-icon icon="album"></iron-icon>${TabAlbums}</a>
+            <a href="musicalbumartists.html"><iron-icon icon="music-note"></iron-icon>${TabAlbumArtists}</a>
+            <a href="musicartists.html" class="musicArtistsTab"><iron-icon icon="music-note"></iron-icon>${TabArtists}</a>
+            <a href="songs.html" class="musicSongsTab"><iron-icon icon="music-note"></iron-icon>${TabSongs}</a>
+            <a href="musicgenres.html"><iron-icon icon="library-music"></iron-icon>${TabGenres}</a>
+            <a href="musicvideos.html"><iron-icon icon="video-library"></iron-icon>${TabMusicVideos}</a>
         </div>
         <div data-role="content">
             <div class="ehsContent squareEhsContent">
diff --git a/dashboard-ui/musicvideos.html b/dashboard-ui/musicvideos.html
index e5805c55d..36a81fb0f 100644
--- a/dashboard-ui/musicvideos.html
+++ b/dashboard-ui/musicvideos.html
@@ -7,13 +7,13 @@
     <div id="musicVideosPage" data-role="page" class="page libraryPage" data-require="scripts/musicvideos,scripts/queryfilters">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="musicrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="musicalbums.html"><i class="material-icons">album</i>${TabAlbums}</a>
-            <a href="musicalbumartists.html"><i class="material-icons">music_note</i>${TabAlbumArtists}</a>
-            <a href="musicartists.html" class="musicArtistsTab"><i class="material-icons">music_note</i>${TabArtists}</a>
-            <a href="songs.html" class="musicSongsTab"><i class="material-icons">music_note</i>${TabSongs}</a>
-            <a href="musicgenres.html"><i class="material-icons">library_music</i>${TabGenres}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">video_library</i>${TabMusicVideos}</a>
+            <a href="musicrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="musicalbums.html"><iron-icon icon="album"></iron-icon>${TabAlbums}</a>
+            <a href="musicalbumartists.html"><iron-icon icon="music-note"></iron-icon>${TabAlbumArtists}</a>
+            <a href="musicartists.html" class="musicArtistsTab"><iron-icon icon="music-note"></iron-icon>${TabArtists}</a>
+            <a href="songs.html" class="musicSongsTab"><iron-icon icon="music-note"></iron-icon>${TabSongs}</a>
+            <a href="musicgenres.html"><iron-icon icon="library-music"></iron-icon>${TabGenres}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="video-library"></iron-icon>${TabMusicVideos}</a>
         </div>
 
         <div class="alphabetPicker">
diff --git a/dashboard-ui/mysync.html b/dashboard-ui/mysync.html
index 6a39433cb..34cfa5706 100644
--- a/dashboard-ui/mysync.html
+++ b/dashboard-ui/mysync.html
@@ -7,7 +7,7 @@
     <div id="mySyncActivityPage" data-role="page" class="page libraryPage syncActivityPage mySyncPage" data-contextname="${TitleSync}" data-require="scripts/syncactivity,scripts/taskbutton">
 
         <div class="libraryViewNav">
-            <a href="#" class="ui-btn-active"><i class="material-icons">refresh</i>${TabSyncJobs}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="refresh"></iron-icon>${TabSyncJobs}</a>
         </div>
 
         <div data-role="content">
diff --git a/dashboard-ui/mysyncjob.html b/dashboard-ui/mysyncjob.html
index fc7bc780b..b38f18fab 100644
--- a/dashboard-ui/mysyncjob.html
+++ b/dashboard-ui/mysyncjob.html
@@ -7,7 +7,7 @@
     <div id="mySyncJobPage" data-role="page" class="page libraryPage syncJobPage mySyncPage" data-contextname="${TitleSync}" data-require="scripts/syncjob">
 
         <div class="libraryViewNav">
-            <a href="mysync.html" class="ui-btn-active"><i class="material-icons">refresh</i>${TabSyncJobs}</a>
+            <a href="mysync.html" class="ui-btn-active"><iron-icon icon="refresh"></iron-icon>${TabSyncJobs}</a>
         </div>
 
         <div data-role="content">
diff --git a/dashboard-ui/photos.html b/dashboard-ui/photos.html
index 48d2432ea..75ab0b50f 100644
--- a/dashboard-ui/photos.html
+++ b/dashboard-ui/photos.html
@@ -7,9 +7,9 @@
     <div id="photosPage" data-role="page" class="page libraryPage" data-require="scripts/photos,scripts/queryfilters">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="photos.html" class="ui-btn-active lnkPhotoAlbums"><i class="material-icons">photo_album</i>${TabAlbums}</a>
-            <a href="photos.html?context=photos-photos" class="lnkPhotos"><i class="material-icons">photo</i>${TabPhotos}</a>
-            <a href="photos.html?context=photos-videos" class="lnkVideos"><i class="material-icons">videocam</i>${TabVideos}</a>
+            <a href="photos.html" class="ui-btn-active lnkPhotoAlbums"><iron-icon icon="photo-album"></iron-icon>${TabAlbums}</a>
+            <a href="photos.html?context=photos-photos" class="lnkPhotos"><iron-icon icon="photo"></iron-icon>${TabPhotos}</a>
+            <a href="photos.html?context=photos-videos" class="lnkVideos"><iron-icon icon="videocam"></iron-icon>${TabVideos}</a>
         </div>
 
         <div data-role="content">
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 3f1f71c27..83e41b849 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -1853,7 +1853,6 @@ var AppInfo = {};
             }
             else if ($.browser.safari) {
                 Dashboard.importCss('themes/ios.css');
-                Dashboard.importCss('thirdparty/materialicons/style.css');
             }
         }
 
diff --git a/dashboard-ui/songs.html b/dashboard-ui/songs.html
index 6fed7b5c7..8353eae13 100644
--- a/dashboard-ui/songs.html
+++ b/dashboard-ui/songs.html
@@ -6,13 +6,13 @@
 <body>
     <div id="songsPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="musicartist" data-require="scripts/songs,scripts/queryfilters">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="musicrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="musicalbums.html"><i class="material-icons">album</i>${TabAlbums}</a>
-            <a href="musicalbumartists.html"><i class="material-icons">music_note</i>${TabAlbumArtists}</a>
-            <a href="musicartists.html" class="musicArtistsTab"><i class="material-icons">music_note</i>${TabArtists}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">music_note</i>${TabSongs}</a>
-            <a href="musicgenres.html"><i class="material-icons">library_music</i>${TabGenres}</a>
-            <a href="musicvideos.html"><i class="material-icons">video_library</i>${TabMusicVideos}</a>
+            <a href="musicrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="musicalbums.html"><iron-icon icon="album"></iron-icon>${TabAlbums}</a>
+            <a href="musicalbumartists.html"><iron-icon icon="music-note"></iron-icon>${TabAlbumArtists}</a>
+            <a href="musicartists.html" class="musicArtistsTab"><iron-icon icon="music-note"></iron-icon>${TabArtists}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="music-note"></iron-icon>${TabSongs}</a>
+            <a href="musicgenres.html"><iron-icon icon="library-music"></iron-icon>${TabGenres}</a>
+            <a href="musicvideos.html"><iron-icon icon="video-library"></iron-icon>${TabMusicVideos}</a>
         </div>
         <div data-role="content">
             <div class="viewSettings">
diff --git a/dashboard-ui/themes/ios.css b/dashboard-ui/themes/ios.css
index 16fc0eb2a..30d03e35f 100644
--- a/dashboard-ui/themes/ios.css
+++ b/dashboard-ui/themes/ios.css
@@ -36,14 +36,11 @@ html, body {
     height: auto !important;
 }
 
-.libraryViewNav .material-icons {
+.libraryViewNav iron-icon {
+    width: 22px;
+    height: 22px;
     display: block;
-    margin-top: -6px;
-    font-size: 15px;
-}
-
-.libraryViewNav paper-tab .material-icons {
-    margin-top: 0;
+    margin: -4px auto 6px;
 }
 
 .libraryViewNav #selectionBar {
diff --git a/dashboard-ui/thirdparty/emby-icons.html b/dashboard-ui/thirdparty/emby-icons.html
index 00876f912..136006195 100644
--- a/dashboard-ui/thirdparty/emby-icons.html
+++ b/dashboard-ui/thirdparty/emby-icons.html
@@ -112,6 +112,15 @@ See [iron-iconset](#iron-iconset) and [iron-iconset-svg](#iron-iconset-svg) for
             <g id="cloud"><path d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96z" /></g>
             <g id="play-circle-outline"><path d="M10 16.5l6-4.5-6-4.5v9zM12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z" /></g>
             <g id="share"><path d="M18 16.08c-.76 0-1.44.3-1.96.77L8.91 12.7c.05-.23.09-.46.09-.7s-.04-.47-.09-.7l7.05-4.11c.54.5 1.25.81 2.04.81 1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3c0 .24.04.47.09.7L8.04 9.81C7.5 9.31 6.79 9 6 9c-1.66 0-3 1.34-3 3s1.34 3 3 3c.79 0 1.5-.31 2.04-.81l7.12 4.16c-.05.21-.08.43-.08.65 0 1.61 1.31 2.92 2.92 2.92 1.61 0 2.92-1.31 2.92-2.92s-1.31-2.92-2.92-2.92z" /></g>
+            <g id="navigate-next"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z" /></g>
+            <g id="grid-on"><path d="M20 2H4c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zM8 20H4v-4h4v4zm0-6H4v-4h4v4zm0-6H4V4h4v4zm6 12h-4v-4h4v4zm0-6h-4v-4h4v4zm0-6h-4V4h4v4zm6 12h-4v-4h4v4zm0-6h-4v-4h4v4zm0-6h-4V4h4v4z" /></g>
+            <g id="slideshow"><path d="M10 8v8l5-4-5-4zm9-5H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V5h14v14z" /></g>
+            <g id="movie"><path d="M18 4l2 4h-3l-2-4h-2l2 4h-3l-2-4H8l2 4H7L5 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V4h-4z" /></g>
+            <g id="new-releases"><path d="M23 12l-2.44-2.78.34-3.68-3.61-.82-1.89-3.18L12 3 8.6 1.54 6.71 4.72l-3.61.81.34 3.68L1 12l2.44 2.78-.34 3.69 3.61.82 1.89 3.18L12 21l3.4 1.46 1.89-3.18 3.61-.82-.34-3.68L23 12zm-10 5h-2v-2h2v2zm0-4h-2V7h2v6z" /></g>
+            <g id="photo"><path d="M21 19V5c0-1.1-.9-2-2-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5-4.5z" /></g>
+            <g id="photo-album"><path d="M18 2H6c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zM6 4h5v8l-2.5-1.5L6 12V4zm0 15l3-3.86 2.14 2.58 3-3.86L18 19H6z" /></g>
+            <g id="local-movies"><path d="M18 3v2h-2V3H8v2H6V3H4v18h2v-2h2v2h8v-2h2v2h2V3h-2zM8 17H6v-2h2v2zm0-4H6v-2h2v2zm0-4H6V7h2v2zm10 8h-2v-2h2v2zm0-4h-2v-2h2v2zm0-4h-2V7h2v2z" /></g>
+            <g id="music-note"><path d="M12 3v10.55c-.59-.34-1.27-.55-2-.55-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4V7h4V3h-6z" /></g>
         </defs>
     </svg>
 </iron-iconset-svg>
diff --git a/dashboard-ui/thirdparty/materialicons/MaterialIcons-Regular.eot b/dashboard-ui/thirdparty/materialicons/MaterialIcons-Regular.eot
deleted file mode 100644
index b90292263..000000000
Binary files a/dashboard-ui/thirdparty/materialicons/MaterialIcons-Regular.eot and /dev/null differ
diff --git a/dashboard-ui/thirdparty/materialicons/MaterialIcons-Regular.ttf b/dashboard-ui/thirdparty/materialicons/MaterialIcons-Regular.ttf
deleted file mode 100644
index 0768c78c3..000000000
Binary files a/dashboard-ui/thirdparty/materialicons/MaterialIcons-Regular.ttf and /dev/null differ
diff --git a/dashboard-ui/thirdparty/materialicons/MaterialIcons-Regular.woff b/dashboard-ui/thirdparty/materialicons/MaterialIcons-Regular.woff
deleted file mode 100644
index 3a08d45e4..000000000
Binary files a/dashboard-ui/thirdparty/materialicons/MaterialIcons-Regular.woff and /dev/null differ
diff --git a/dashboard-ui/thirdparty/materialicons/MaterialIcons-Regular.woff2 b/dashboard-ui/thirdparty/materialicons/MaterialIcons-Regular.woff2
deleted file mode 100644
index b1ffe8cfa..000000000
Binary files a/dashboard-ui/thirdparty/materialicons/MaterialIcons-Regular.woff2 and /dev/null differ
diff --git a/dashboard-ui/thirdparty/materialicons/style.css b/dashboard-ui/thirdparty/materialicons/style.css
deleted file mode 100644
index 713fdea9b..000000000
--- a/dashboard-ui/thirdparty/materialicons/style.css
+++ /dev/null
@@ -1,23 +0,0 @@
-@font-face {
-    font-family: 'Material Icons';
-    font-style: normal;
-    font-weight: 400;
-    src: url(MaterialIcons-Regular.eot); /* For IE6-8 */
-    src: local('Material Icons'), local('MaterialIcons-Regular'), url(MaterialIcons-Regular.woff2) format('woff2'), url(MaterialIcons-Regular.woff) format('woff'), url(MaterialIcons-Regular.ttf) format('truetype');
-}
-
-.material-icons {
-    font-family: 'Material Icons';
-    font-weight: normal;
-    font-style: normal;
-    display: inline-block;
-    text-transform: none;
-    /* Support for all WebKit browsers. */
-    -webkit-font-smoothing: antialiased;
-    /* Support for Safari and Chrome. */
-    text-rendering: optimizeLegibility;
-    /* Support for Firefox. */
-    -moz-osx-font-smoothing: grayscale;
-    /* Support for IE. */
-    font-feature-settings: 'liga';
-}
\ No newline at end of file
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index a1623b71e..c33bf826e 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -130,21 +130,12 @@ paper-button:not(.iconRight) iron-icon, paper-button:not(.iconRight) .fa {
     margin-right: .5em;
 }
 
-paper-button:not(.iconRight) .material-icons {
-    margin-right: .25em;
-}
-
-paper-button.iconRight iron-icon, paper-button.iconRight .fa, paper-button.iconRight .material-icons {
+paper-button.iconRight iron-icon, paper-button.iconRight .fa {
     position: absolute;
     right: 5px;
     top: 5px;
 }
 
-paper-button .material-icons {
-    font-size: 150%;
-    vertical-align: middle;
-}
-
 paper-button .fa {
     vertical-align: middle;
 }
diff --git a/dashboard-ui/tvgenres.html b/dashboard-ui/tvgenres.html
index dd076eabf..e745f3aec 100644
--- a/dashboard-ui/tvgenres.html
+++ b/dashboard-ui/tvgenres.html
@@ -6,14 +6,14 @@
 <body>
     <div id="tvGenresPage" data-role="page" class="page libraryPage" data-require="scripts/tvgenres">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="tvrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="tvlatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a>
-            <a href="tvupcoming.html"><i class="material-icons">schedule</i>${TabUpcoming}</a>
-            <a href="tvshows.html"><i class="material-icons">live_tv</i>${TabShows}</a>
-            <a href="episodes.html" class="tvEpisodesTab"><i class="material-icons">slideshow</i>${TabEpisodes}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">video_library</i>${TabGenres}</a>
-            <a href="tvpeople.html" class="tvPeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-            <a href="tvstudios.html" class="tvStudiosTab"><i class="material-icons">account_box</i>${TabNetworks}</a>
+            <a href="tvrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="tvlatest.html"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
+            <a href="tvupcoming.html"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
+            <a href="tvshows.html"><iron-icon icon="live-tv"></iron-icon>${TabShows}</a>
+            <a href="episodes.html" class="tvEpisodesTab"><iron-icon icon="slideshow"></iron-icon>${TabEpisodes}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+            <a href="tvpeople.html" class="tvPeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+            <a href="tvstudios.html" class="tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
         </div>
         <div data-role="content">
             <div class="viewSettings">
diff --git a/dashboard-ui/tvlatest.html b/dashboard-ui/tvlatest.html
index 5b44d5efe..95036b1cf 100644
--- a/dashboard-ui/tvlatest.html
+++ b/dashboard-ui/tvlatest.html
@@ -7,14 +7,14 @@
     <div id="tvNextUpPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="series" data-require="scripts/tvlatest,paperbuttonstyle">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="tvrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">new_releases</i>${TabLatest}</a>
-            <a href="tvupcoming.html"><i class="material-icons">schedule</i>${TabUpcoming}</a>
-            <a href="tvshows.html"><i class="material-icons">live_tv</i>${TabShows}</a>
-            <a href="episodes.html" class="tvEpisodesTab"><i class="material-icons">slideshow</i>${TabEpisodes}</a>
-            <a href="tvgenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-            <a href="tvpeople.html" class="tvPeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-            <a href="tvstudios.html" class="tvStudiosTab"><i class="material-icons">account_box</i>${TabNetworks}</a>
+            <a href="tvrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
+            <a href="tvupcoming.html"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
+            <a href="tvshows.html"><iron-icon icon="live-tv"></iron-icon>${TabShows}</a>
+            <a href="episodes.html" class="tvEpisodesTab"><iron-icon icon="slideshow"></iron-icon>${TabEpisodes}</a>
+            <a href="tvgenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+            <a href="tvpeople.html" class="tvPeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+            <a href="tvstudios.html" class="tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
         </div>
         <div data-role="content">
             <div class="ehsContent">
diff --git a/dashboard-ui/tvpeople.html b/dashboard-ui/tvpeople.html
index e9d2db127..aa4a5b88c 100644
--- a/dashboard-ui/tvpeople.html
+++ b/dashboard-ui/tvpeople.html
@@ -6,14 +6,14 @@
 <body>
     <div id="tvPeoplePage" data-role="page" class="page libraryPage" data-require="scripts/tvpeople">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="tvrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="tvlatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a>
-            <a href="tvupcoming.html"><i class="material-icons">schedule</i>${TabUpcoming}</a>
-            <a href="tvshows.html"><i class="material-icons">live_tv</i>${TabShows}</a>
-            <a href="episodes.html" class="tvEpisodesTab"><i class="material-icons">slideshow</i>${TabEpisodes}</a>
-            <a href="tvgenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">people</i>${TabPeople}</a>
-            <a href="tvstudios.html" class="tvStudiosTab"><i class="material-icons">account_box</i>${TabNetworks}</a>
+            <a href="tvrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="tvlatest.html"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
+            <a href="tvupcoming.html"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
+            <a href="tvshows.html"><iron-icon icon="live-tv"></iron-icon>${TabShows}</a>
+            <a href="episodes.html" class="tvEpisodesTab"><iron-icon icon="slideshow"></iron-icon>${TabEpisodes}</a>
+            <a href="tvgenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+            <a href="tvstudios.html" class="tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
         </div>
 
         <div class="alphabetPicker">
diff --git a/dashboard-ui/tvrecommended.html b/dashboard-ui/tvrecommended.html
index b436a089e..254758c8f 100644
--- a/dashboard-ui/tvrecommended.html
+++ b/dashboard-ui/tvrecommended.html
@@ -7,14 +7,14 @@
     <div id="tvRecommendedPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="series" data-require="scripts/tvrecommended,paperbuttonstyle">
 
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="tvrecommended.html" class="ui-btn-active"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="tvlatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a>
-            <a href="tvupcoming.html"><i class="material-icons">schedule</i>${TabUpcoming}</a>
-            <a href="tvshows.html"><i class="material-icons">live_tv</i>${TabShows}</a>
-            <a href="episodes.html" class="tvEpisodesTab"><i class="material-icons">slideshow</i>${TabEpisodes}</a>
-            <a href="tvgenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-            <a href="tvpeople.html" class="tvPeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-            <a href="tvstudios.html" class="tvStudiosTab"><i class="material-icons">account_box</i>${TabNetworks}</a>
+            <a href="tvrecommended.html" class="ui-btn-active"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="tvlatest.html"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
+            <a href="tvupcoming.html"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
+            <a href="tvshows.html"><iron-icon icon="live-tv"></iron-icon>${TabShows}</a>
+            <a href="episodes.html" class="tvEpisodesTab"><iron-icon icon="slideshow"></iron-icon>${TabEpisodes}</a>
+            <a href="tvgenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+            <a href="tvpeople.html" class="tvPeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+            <a href="tvstudios.html" class="tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
         </div>
         <div data-role="content">
             <div class="ehsContent">
diff --git a/dashboard-ui/tvshows.html b/dashboard-ui/tvshows.html
index 92d098b21..9a358fd2b 100644
--- a/dashboard-ui/tvshows.html
+++ b/dashboard-ui/tvshows.html
@@ -6,14 +6,14 @@
 <body>
     <div id="tvShowsPage" data-role="page" class="page libraryPage" data-require="scripts/tvshows,scripts/queryfilters">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="tvrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="tvlatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a>
-            <a href="tvupcoming.html"><i class="material-icons">schedule</i>${TabUpcoming}</a>
-            <a href="#" class="ui-btn-active"><i class="material-icons">live_tv</i>${TabShows}</a>
-            <a href="episodes.html" class="tvEpisodesTab"><i class="material-icons">slideshow</i>${TabEpisodes}</a>
-            <a href="tvgenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-            <a href="tvpeople.html" class="tvPeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-            <a href="tvstudios.html" class="tvStudiosTab"><i class="material-icons">account_box</i>${TabNetworks}</a>
+            <a href="tvrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="tvlatest.html"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
+            <a href="tvupcoming.html"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
+            <a href="#" class="ui-btn-active"><iron-icon icon="live-tv"></iron-icon>${TabShows}</a>
+            <a href="episodes.html" class="tvEpisodesTab"><iron-icon icon="slideshow"></iron-icon>${TabEpisodes}</a>
+            <a href="tvgenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+            <a href="tvpeople.html" class="tvPeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+            <a href="tvstudios.html" class="tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
         </div>
         <div class="alphabetPicker">
         </div>
diff --git a/dashboard-ui/tvstudios.html b/dashboard-ui/tvstudios.html
index bc6658350..b32c1187e 100644
--- a/dashboard-ui/tvstudios.html
+++ b/dashboard-ui/tvstudios.html
@@ -6,14 +6,14 @@
 <body>
     <div id="tvStudiosPage" data-role="page" class="page libraryPage" data-require="scripts/tvstudios">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="tvrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="tvlatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a>
-            <a href="tvupcoming.html"><i class="material-icons">schedule</i>${TabUpcoming}</a>
-            <a href="tvshows.html"><i class="material-icons">live_tv</i>${TabShows}</a>
-            <a href="episodes.html" class="tvEpisodesTab"><i class="material-icons">slideshow</i>${TabEpisodes}</a>
-            <a href="tvgenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-            <a href="tvpeople.html" class="tvPeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-            <a href="#" class="ui-btn-active tvStudiosTab"><i class="material-icons">account_box</i>${TabNetworks}</a>
+            <a href="tvrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="tvlatest.html"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
+            <a href="tvupcoming.html"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
+            <a href="tvshows.html"><iron-icon icon="live-tv"></iron-icon>${TabShows}</a>
+            <a href="episodes.html" class="tvEpisodesTab"><iron-icon icon="slideshow"></iron-icon>${TabEpisodes}</a>
+            <a href="tvgenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+            <a href="tvpeople.html" class="tvPeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+            <a href="#" class="ui-btn-active tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
         </div>
         <div data-role="content">
             <div class="viewSettings">
diff --git a/dashboard-ui/tvupcoming.html b/dashboard-ui/tvupcoming.html
index c3760725a..39cebefb3 100644
--- a/dashboard-ui/tvupcoming.html
+++ b/dashboard-ui/tvupcoming.html
@@ -6,14 +6,14 @@
 <body>
     <div id="tvUpcomingPage" data-role="page" class="page libraryPage backdropPage" data-backdroptype="series" data-require="scripts/tvupcoming">
         <div class="libraryViewNav scopedLibraryViewNav">
-            <a href="tvrecommended.html"><i class="material-icons">info</i>${TabSuggestions}</a>
-            <a href="tvlatest.html"><i class="material-icons">new_releases</i>${TabLatest}</a>
-            <a href="tvupcoming.html" class="ui-btn-active"><i class="material-icons">schedule</i>${TabUpcoming}</a>
-            <a href="tvshows.html"><i class="material-icons">live_tv</i>${TabShows}</a>
-            <a href="episodes.html" class="tvEpisodesTab"><i class="material-icons">slideshow</i>${TabEpisodes}</a>
-            <a href="tvgenres.html"><i class="material-icons">video_library</i>${TabGenres}</a>
-            <a href="tvpeople.html" class="tvPeopleTab"><i class="material-icons">people</i>${TabPeople}</a>
-            <a href="tvstudios.html" class="tvStudiosTab"><i class="material-icons">account_box</i>${TabNetworks}</a>
+            <a href="tvrecommended.html"><iron-icon icon="info"></iron-icon>${TabSuggestions}</a>
+            <a href="tvlatest.html"><iron-icon icon="new-releases"></iron-icon>${TabLatest}</a>
+            <a href="tvupcoming.html" class="ui-btn-active"><iron-icon icon="schedule"></iron-icon>${TabUpcoming}</a>
+            <a href="tvshows.html"><iron-icon icon="live-tv"></iron-icon>${TabShows}</a>
+            <a href="episodes.html" class="tvEpisodesTab"><iron-icon icon="slideshow"></iron-icon>${TabEpisodes}</a>
+            <a href="tvgenres.html"><iron-icon icon="video-library"></iron-icon>${TabGenres}</a>
+            <a href="tvpeople.html" class="tvPeopleTab"><iron-icon icon="people"></iron-icon>${TabPeople}</a>
+            <a href="tvstudios.html" class="tvStudiosTab"><iron-icon icon="account-box"></iron-icon>${TabNetworks}</a>
         </div>
         <div data-role="content">
             <div class="ehsContent">
diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html
index d9267a088..8120b559d 100644
--- a/dashboard-ui/vulcanize-out.html
+++ b/dashboard-ui/vulcanize-out.html
@@ -17284,6 +17284,15 @@ paper-ripple {
             <g id="cloud"><path d="M19.35 10.04C18.67 6.59 15.64 4 12 4 9.11 4 6.6 5.64 5.35 8.04 2.34 8.36 0 10.91 0 14c0 3.31 2.69 6 6 6h13c2.76 0 5-2.24 5-5 0-2.64-2.05-4.78-4.65-4.96z"></path></g>
             <g id="play-circle-outline"><path d="M10 16.5l6-4.5-6-4.5v9zM12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8z"></path></g>
             <g id="share"><path d="M18 16.08c-.76 0-1.44.3-1.96.77L8.91 12.7c.05-.23.09-.46.09-.7s-.04-.47-.09-.7l7.05-4.11c.54.5 1.25.81 2.04.81 1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3c0 .24.04.47.09.7L8.04 9.81C7.5 9.31 6.79 9 6 9c-1.66 0-3 1.34-3 3s1.34 3 3 3c.79 0 1.5-.31 2.04-.81l7.12 4.16c-.05.21-.08.43-.08.65 0 1.61 1.31 2.92 2.92 2.92 1.61 0 2.92-1.31 2.92-2.92s-1.31-2.92-2.92-2.92z"></path></g>
+            <g id="navigate-next"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"></path></g>
+            <g id="grid-on"><path d="M20 2H4c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zM8 20H4v-4h4v4zm0-6H4v-4h4v4zm0-6H4V4h4v4zm6 12h-4v-4h4v4zm0-6h-4v-4h4v4zm0-6h-4V4h4v4zm6 12h-4v-4h4v4zm0-6h-4v-4h4v4zm0-6h-4V4h4v4z"></path></g>
+            <g id="slideshow"><path d="M10 8v8l5-4-5-4zm9-5H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 16H5V5h14v14z"></path></g>
+            <g id="movie"><path d="M18 4l2 4h-3l-2-4h-2l2 4h-3l-2-4H8l2 4H7L5 4H4c-1.1 0-1.99.9-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V4h-4z"></path></g>
+            <g id="new-releases"><path d="M23 12l-2.44-2.78.34-3.68-3.61-.82-1.89-3.18L12 3 8.6 1.54 6.71 4.72l-3.61.81.34 3.68L1 12l2.44 2.78-.34 3.69 3.61.82 1.89 3.18L12 21l3.4 1.46 1.89-3.18 3.61-.82-.34-3.68L23 12zm-10 5h-2v-2h2v2zm0-4h-2V7h2v6z"></path></g>
+            <g id="photo"><path d="M21 19V5c0-1.1-.9-2-2-2H5c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h14c1.1 0 2-.9 2-2zM8.5 13.5l2.5 3.01L14.5 12l4.5 6H5l3.5-4.5z"></path></g>
+            <g id="photo-album"><path d="M18 2H6c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V4c0-1.1-.9-2-2-2zM6 4h5v8l-2.5-1.5L6 12V4zm0 15l3-3.86 2.14 2.58 3-3.86L18 19H6z"></path></g>
+            <g id="local-movies"><path d="M18 3v2h-2V3H8v2H6V3H4v18h2v-2h2v2h8v-2h2v2h2V3h-2zM8 17H6v-2h2v2zm0-4H6v-2h2v2zm0-4H6V7h2v2zm10 8h-2v-2h2v2zm0-4h-2v-2h2v2zm0-4h-2V7h2v2z"></path></g>
+            <g id="music-note"><path d="M12 3v10.55c-.59-.34-1.27-.55-2-.55-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4V7h4V3h-6z"></path></g>
         </defs>
     </svg>
 </iron-iconset-svg>