diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 0000000000..52369be1e3
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+libraries/
diff --git a/.eslintrc.yml b/.eslintrc.yml
index 4110862a11..b215e15800 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -2,3 +2,26 @@ env:
   es6: true
   browser: true
   amd: true
+
+rules:
+  block-spacing: ["error"]
+  brace-style: ["error"]
+  comma-dangle: ["error", "never"]
+  comma-spacing: ["error"]
+  eol-last: ["off"]
+  indent: ["error", 4, { "SwitchCase": 1 }]
+  keyword-spacing: ["error"]
+  line-comment-position: ["off"]
+  max-statements-per-line: ["error"]
+  no-empty: ["error"]
+  no-extra-semi: ["error"]
+  no-floating-decimal: ["error"]
+  no-multi-spaces: ["error"]
+  no-multiple-empty-lines: ["error", { "max": 1 }]
+  no-trailing-spaces: ["error"]
+  no-void: ["off"]
+  one-var: ["error", "never"]
+  padding-line-between-statements: ["off"]
+  semi: ["off"]
+  space-before-blocks: ["error"]
+  yoda: ["off"]
diff --git a/src/bundle.js b/src/bundle.js
index 4643b23f0d..6931b34dd0 100644
--- a/src/bundle.js
+++ b/src/bundle.js
@@ -6,59 +6,87 @@ var _define = window.define;
 
 // document-register-element
 var docRegister = require("document-register-element");
-_define("document-register-element", function() { return docRegister; });
+_define("document-register-element", function() {
+    return docRegister;
+});
 
 // fetch
 var fetch = require("whatwg-fetch");
-_define("fetch", function() { return fetch });
+_define("fetch", function() {
+    return fetch
+});
 
 // flvjs
 var flvjs = require("flv.js");
-_define("flvjs", function() { return flvjs; });
+_define("flvjs", function() {
+    return flvjs;
+});
 
 // jstree
 var jstree = require("jstree");
 require("jstree/dist/themes/default/style.css");
-_define("jstree", function() { return jstree; });
+_define("jstree", function() {
+    return jstree;
+});
 
 // jquery
 var jquery = require("jquery");
-_define("jQuery", function() { return jquery; });
+_define("jQuery", function() {
+    return jquery;
+});
 
 // hlsjs
 var hlsjs = require("hls.js");
-_define("hlsjs", function() { return hlsjs; });
+_define("hlsjs", function() {
+    return hlsjs;
+});
 
 // howler
 var howler = require("howler");
-_define("howler", function() { return howler; });
+_define("howler", function() {
+    return howler;
+});
 
 // native-promise-only
 var nativePromise = require("native-promise-only");
-_define("native-promise-only", function() { return nativePromise; });
+_define("native-promise-only", function() {
+    return nativePromise;
+});
 
 // resize-observer-polyfill
 var resize = require("resize-observer-polyfill");
-_define("resize-observer-polyfill", function() { return resize; });
+_define("resize-observer-polyfill", function() {
+    return resize;
+});
 
 // shaka
 var shaka = require("shaka-player");
-_define("shaka", function() { return shaka; });
+_define("shaka", function() {
+    return shaka;
+});
 
 // swiper
 var swiper = require("swiper");
 require("swiper/dist/css/swiper.min.css");
-_define("swiper", function() { return swiper; });
+_define("swiper", function() {
+    return swiper;
+});
 
 // sortable
 var sortable = require("sortablejs");
-_define("sortable", function() { return sortable; });
+_define("sortable", function() {
+    return sortable;
+});
 
 // webcomponents
 var webcomponents = require("webcomponents.js-2");
-_define("webcomponents", function() { return webcomponents });
+_define("webcomponents", function() {
+    return webcomponents
+});
 
 // libjass
 var libjass = require("libjass");
 require("libjass/libjass.css");
-_define("libjass", function() { return libjass; });
+_define("libjass", function() {
+    return libjass;
+});
diff --git a/src/components/accessschedule/accessschedule.template.html b/src/components/accessschedule/accessschedule.template.html
index 8c01d35962..50d172ae49 100644
--- a/src/components/accessschedule/accessschedule.template.html
+++ b/src/components/accessschedule/accessschedule.template.html
@@ -1,5 +1,7 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
+        <i class="md-icon">arrow_back</i>
+    </button>
     <h3 class="formDialogHeaderTitle">
         ${HeaderAccessSchedule}
     </h3>
@@ -36,4 +38,4 @@
             </div>
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/components/actionsheet/actionsheet.js b/src/components/actionsheet/actionsheet.js
index 54b6aeddf2..d4e6b61c8a 100644
--- a/src/components/actionsheet/actionsheet.js
+++ b/src/components/actionsheet/actionsheet.js
@@ -139,7 +139,9 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
             style += "min-width:" + minWidth + "px;";
         }
 
-        var i, length, option;
+        var i;
+        var length;
+        var option;
         var renderIcon = false;
         var icons = [];
         var itemIcon;
@@ -156,7 +158,7 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
         }
 
         if (layoutManager.tv) {
-            html += '<button is="paper-icon-button-light" class="btnCloseActionSheet hide-mouse-idle-tv" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
+            html += '<button is="paper-icon-button-light" class="btnCloseActionSheet hide-mouse-idle-tv" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
         }
 
         // If any items have an icon, give them all an icon just to make sure they're all lined up evenly
@@ -225,8 +227,7 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
             if (itemIcon) {
 
                 html += '<i class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent md-icon">' + itemIcon + '</i>';
-            }
-            else if (renderIcon && !center) {
+            } else if (renderIcon && !center) {
                 html += '<i class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent md-icon" style="visibility:hidden;">check</i>';
             }
 
@@ -356,4 +357,4 @@ define(['dialogHelper', 'layoutManager', 'globalize', 'browser', 'dom', 'emby-bu
     return {
         show: show
     };
-});
\ No newline at end of file
+});
diff --git a/src/components/alert.js b/src/components/alert.js
index 6cf7fea75d..8a4dc11c20 100644
--- a/src/components/alert.js
+++ b/src/components/alert.js
@@ -35,7 +35,7 @@ define(['browser', 'dialog', 'globalize'], function (browser, dialog, globalize)
                 if (result === 'ok') {
                     return Promise.resolve();
                 }
-    
+
                 return Promise.reject();
             });
         }
diff --git a/src/components/alphapicker/alphapicker.js b/src/components/alphapicker/alphapicker.js
index 4cf77f451a..b9d31be5dd 100644
--- a/src/components/alphapicker/alphapicker.js
+++ b/src/components/alphapicker/alphapicker.js
@@ -50,9 +50,7 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b
 
         var vertical = element.classList.contains('alphaPicker-vertical');
 
-        if (vertical) {
-
-        } else {
+        if (!vertical) {
             element.classList.add('focuscontainer-x');
         }
 
@@ -69,8 +67,7 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b
 
         html += '<div class="' + rowClassName + '">';
         if (options.mode === 'keyboard') {
-            // space_bar icon
-            html += '<button data-value=" " is="paper-icon-button-light" class="' + alphaPickerButtonClassName + '"><i class="md-icon alphaPickerButtonIcon">&#xE256;</i></button>';
+            html += '<button data-value=" " is="paper-icon-button-light" class="' + alphaPickerButtonClassName + '"><i class="md-icon alphaPickerButtonIcon">space_bar</i></button>';
         } else {
             letters = ['#'];
             html += mapLetters(letters, vertical).join('');
@@ -80,8 +77,7 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b
         html += mapLetters(letters, vertical).join('');
 
         if (options.mode === 'keyboard') {
-            // backspace icon
-            html += '<button data-value="backspace" is="paper-icon-button-light" class="' + alphaPickerButtonClassName + '"><i class="md-icon alphaPickerButtonIcon">&#xE14A;</i></button>';
+            html += '<button data-value="backspace" is="paper-icon-button-light" class="' + alphaPickerButtonClassName + '"><i class="md-icon alphaPickerButtonIcon">backspace</i></button>';
             html += '</div>';
 
             letters = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
@@ -230,7 +226,8 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b
     AlphaPicker.prototype.value = function (value, applyValue) {
 
         var element = this.options.element;
-        var btn, selected;
+        var btn;
+        var selected;
 
         if (value !== undefined) {
             if (value != null) {
@@ -321,4 +318,4 @@ define(['focusManager', 'layoutManager', 'dom', 'css!./style.css', 'paper-icon-b
     };
 
     return AlphaPicker;
-});
\ No newline at end of file
+});
diff --git a/src/components/autoFocuser.js b/src/components/autoFocuser.js
new file mode 100644
index 0000000000..09ded814f2
--- /dev/null
+++ b/src/components/autoFocuser.js
@@ -0,0 +1,101 @@
+define(["focusManager", "layoutManager"], function (focusManager, layoutManager) {
+    "use strict";
+
+    /**
+     * Previously selected element.
+     */
+    var activeElement;
+
+    /**
+     * Returns true if AutoFocuser is enabled.
+     */
+    function isEnabled() {
+        return layoutManager.tv;
+    }
+
+    /**
+     * Start AutoFocuser
+     */
+    function enable() {
+        if (!isEnabled()) {
+            return;
+        }
+
+        window.addEventListener("focusin", function (e) {
+            activeElement = e.target;
+        });
+
+        console.log("AutoFocuser enabled");
+    }
+
+    /**
+     * Create an array from some source.
+     */
+    var arrayFrom = Array.prototype.from || function (src) {
+        return Array.prototype.slice.call(src);
+    }
+
+    /**
+     * Set focus on a suitable element, taking into account the previously selected.
+     */
+    function autoFocus(container) {
+        if (!isEnabled()) {
+            return;
+        }
+
+        container = container || document.body;
+
+        var candidates = [];
+
+        if (activeElement) {
+            // These elements are recreated
+            if (activeElement.classList.contains("btnPreviousPage")) {
+                candidates.push(container.querySelector(".btnPreviousPage"));
+                candidates.push(container.querySelector(".btnNextPage"));
+            } else if (activeElement.classList.contains("btnNextPage")) {
+                candidates.push(container.querySelector(".btnNextPage"));
+                candidates.push(container.querySelector(".btnPreviousPage"));
+            } else if (activeElement.classList.contains("btnSelectView")) {
+                candidates.push(container.querySelector(".btnSelectView"));
+            }
+
+            candidates.push(activeElement);
+        }
+
+        candidates = candidates.concat(arrayFrom(container.querySelectorAll(".btnResume")));
+        candidates = candidates.concat(arrayFrom(container.querySelectorAll(".btnPlay")));
+
+        var focusedElement;
+
+        candidates.every(function (element) {
+            if (focusManager.isCurrentlyFocusable(element)) {
+                focusManager.focus(element);
+                focusedElement = element;
+                return false;
+            }
+
+            return true;
+        });
+
+        if (!focusedElement) {
+            // FIXME: Multiple itemsContainers
+            var itemsContainer = container.querySelector(".itemsContainer");
+
+            if (itemsContainer) {
+                focusedElement = focusManager.autoFocus(itemsContainer);
+            }
+        }
+
+        if (!focusedElement) {
+            focusedElement = focusManager.autoFocus(container);
+        }
+
+        return focusedElement;
+    }
+
+    return {
+        isEnabled: isEnabled,
+        enable: enable,
+        autoFocus: autoFocus
+    };
+});
diff --git a/src/components/cardbuilder/card.css b/src/components/cardbuilder/card.css
index 1414fd8391..ec19c83f00 100644
--- a/src/components/cardbuilder/card.css
+++ b/src/components/cardbuilder/card.css
@@ -145,7 +145,7 @@ button {
 }
 
 .cardImageContainer {
-    background-size: contain;
+    background-size: cover;
     background-repeat: no-repeat;
     background-position: center center;
     display: -webkit-flex;
diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js
index 09ad8f1a6d..3b7516309c 100644
--- a/src/components/cardbuilder/cardBuilder.js
+++ b/src/components/cardbuilder/cardBuilder.js
@@ -321,7 +321,8 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
             var apiClient;
             var lastServerId;
 
-            var i, length;
+            var i;
+            var length;
 
             for (i = 0, length = items.length; i < length; i++) {
 
@@ -339,19 +340,14 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
                     if (options.indexBy === 'PremiereDate') {
                         if (item.PremiereDate) {
                             try {
-
                                 newIndexValue = datetime.toLocaleDateString(datetime.parseISO8601Date(item.PremiereDate), { weekday: 'long', month: 'long', day: 'numeric' });
-
                             } catch (err) {
+                                console.log('error parsing timestamp for premiere date');
                             }
                         }
-                    }
-
-                    else if (options.indexBy === 'ProductionYear') {
+                    } else if (options.indexBy === 'ProductionYear') {
                         newIndexValue = item.ProductionYear;
-                    }
-
-                    else if (options.indexBy === 'CommunityRating') {
+                    } else if (options.indexBy === 'CommunityRating') {
                         newIndexValue = item.CommunityRating ? (Math.floor(item.CommunityRating) + (item.CommunityRating % 1 >= 0.5 ? 0.5 : 0)) + '+' : null;
                     }
 
@@ -571,22 +567,19 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
                         coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2;
                     }
                 }
-            }
-            else if (item.ParentPrimaryImageTag) {
+            } else if (item.ParentPrimaryImageTag) {
 
                 imgUrl = apiClient.getScaledImageUrl(item.ParentPrimaryImageItemId, {
                     type: "Primary",
                     tag: item.ParentPrimaryImageTag
                 });
-            }
-            else if (item.SeriesPrimaryImageTag) {
+            } else if (item.SeriesPrimaryImageTag) {
 
                 imgUrl = apiClient.getScaledImageUrl(item.SeriesId, {
                     type: "Primary",
                     tag: item.SeriesPrimaryImageTag
                 });
-            }
-            else if (item.AlbumId && item.AlbumPrimaryImageTag) {
+            } else if (item.AlbumId && item.AlbumPrimaryImageTag) {
 
                 width = primaryImageAspectRatio ? Math.round(height * primaryImageAspectRatio) : null;
 
@@ -601,16 +594,14 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
                         coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2;
                     }
                 }
-            }
-            else if (item.Type === 'Season' && item.ImageTags && item.ImageTags.Thumb) {
+            } else if (item.Type === 'Season' && item.ImageTags && item.ImageTags.Thumb) {
 
                 imgUrl = apiClient.getScaledImageUrl(item.Id, {
                     type: "Thumb",
                     tag: item.ImageTags.Thumb
                 });
 
-            }
-            else if (item.BackdropImageTags && item.BackdropImageTags.length) {
+            } else if (item.BackdropImageTags && item.BackdropImageTags.length) {
 
                 imgUrl = apiClient.getScaledImageUrl(item.Id, {
                     type: "Backdrop",
@@ -681,7 +672,8 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
             var html = '';
 
             var valid = 0;
-            var i, length;
+            var i;
+            var length;
 
             for (i = 0, length = lines.length; i < length; i++) {
 
@@ -745,8 +737,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
                         date = datetime.parseISO8601Date(item.EndDate);
                         airTimeText += ' - ' + datetime.getDisplayTime(date);
                     }
-                }
-                catch (e) {
+                } catch (e) {
                     console.log("Error parsing date: " + item.StartDate);
                 }
             }
@@ -767,7 +758,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
             if (isOuterFooter && options.cardLayout && layoutManager.mobile) {
 
                 if (options.cardFooterAside !== 'none') {
-                    html += '<button is="paper-icon-button-light" class="itemAction btnCardOptions cardText-secondary" data-action="menu"><i class="md-icon">&#xE5D3;</i></button>';
+                    html += '<button is="paper-icon-button-light" class="itemAction btnCardOptions cardText-secondary" data-action="menu"><i class="md-icon">more_horiz</i></button>';
                 }
             }
 
@@ -794,8 +785,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
                         } else {
                             lines.push(item.SeriesName);
                         }
-                    }
-                    else {
+                    } else {
 
                         if (isUsingLiveTvNaming(item)) {
 
@@ -976,8 +966,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
                 if (options.showSeriesTimerChannel) {
                     if (item.RecordAnyChannel) {
                         lines.push(globalize.translate('AllChannels'));
-                    }
-                    else {
+                    } else {
                         lines.push(item.ChannelName || globalize.translate('OneChannel'));
                     }
                 }
@@ -985,8 +974,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
                 if (options.showPersonRoleOrType) {
                     if (item.Role) {
                         lines.push('as ' + item.Role);
-                    }
-                    else if (item.Type) {
+                    } else if (item.Type) {
                         lines.push(globalize.translate('' + item.Type));
                     } else {
                         lines.push('');
@@ -1060,8 +1048,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
 
                 counts.push(childText);
 
-            }
-            else if (item.Type === 'Genre' || item.Type === 'Studio') {
+            } else if (item.Type === 'Genre' || item.Type === 'Studio') {
 
                 if (item.MovieCount) {
 
@@ -1140,8 +1127,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
 
             if (item.IsPremiere) {
                 html += '<div class="premiereTvProgram programAttributeIndicator">' + globalize.translate('Premiere') + '</div>';
-            }
-            else if (item.IsSeries && !item.IsRepeat) {
+            } else if (item.IsSeries && !item.IsRepeat) {
                 html += '<div class="newTvProgram programAttributeIndicator">' + globalize.translate('AttributeNew') + '</div>';
             }
             //else if (item.IsRepeat) {
@@ -1176,8 +1162,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
             if (action === 'play' && item.IsFolder) {
                 // If this hard-coding is ever removed make sure to test nested photo albums
                 action = 'link';
-            }
-            else if (item.MediaType === 'Photo') {
+            } else if (item.MediaType === 'Photo') {
                 action = 'play';
             }
 
@@ -1272,8 +1257,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
                     height: logoHeight,
                     tag: item.ChannelPrimaryImageTag
                 });
-            }
-            else if (options.showLogo && item.ParentLogoImageTag) {
+            } else if (options.showLogo && item.ParentLogoImageTag) {
                 logoUrl = apiClient.getScaledImageUrl(item.ParentLogoItemId, {
                     type: "Logo",
                     height: logoHeight,
@@ -1288,8 +1272,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
                 footerCssClass = progressHtml ? 'innerCardFooter fullInnerCardFooter' : 'innerCardFooter';
                 innerCardFooter += getCardFooterText(item, apiClient, options, showTitle, forceName, overlayText, imgUrl, footerCssClass, progressHtml, logoUrl, false);
                 footerOverlayed = true;
-            }
-            else if (progressHtml) {
+            } else if (progressHtml) {
                 innerCardFooter += '<div class="innerCardFooter fullInnerCardFooter innerCardFooterClear">';
                 innerCardFooter += progressHtml;
                 innerCardFooter += '</div>';
@@ -1332,15 +1315,15 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
                 var btnCssClass = 'cardOverlayButton cardOverlayButton-br itemAction';
 
                 if (options.centerPlayButton) {
-                    overlayButtons += '<button is="paper-icon-button-light" class="' + btnCssClass + ' cardOverlayButton-centered" data-action="play"><i class="md-icon cardOverlayButtonIcon">&#xE037;</i></button>';
+                    overlayButtons += '<button is="paper-icon-button-light" class="' + btnCssClass + ' cardOverlayButton-centered" data-action="play"><i class="md-icon cardOverlayButtonIcon">play_arrow</i></button>';
                 }
 
                 if (overlayPlayButton && !item.IsPlaceHolder && (item.LocationType !== 'Virtual' || !item.MediaType || item.Type === 'Program') && item.Type !== 'Person') {
-                    overlayButtons += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="play"><i class="md-icon cardOverlayButtonIcon">&#xE037;</i></button>';
+                    overlayButtons += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="play"><i class="md-icon cardOverlayButtonIcon">play_arrow</i></button>';
                 }
 
                 if (options.overlayMoreButton) {
-                    overlayButtons += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="menu"><i class="md-icon cardOverlayButtonIcon">&#xE5D3;</i></button>';
+                    overlayButtons += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="menu"><i class="md-icon cardOverlayButtonIcon">more_horiz</i></button>';
                 }
             }
 
@@ -1394,8 +1377,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
                 indicatorsHtml += indicators.getChildCountIndicatorHtml(item, {
                     minCount: 1
                 });
-            }
-            else {
+            } else {
                 indicatorsHtml += indicators.getPlayedIndicatorHtml(item);
             }
 
@@ -1474,7 +1456,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
             var btnCssClass = 'cardOverlayButton cardOverlayButton-hover itemAction paper-icon-button-light';
 
             if (playbackManager.canPlay(item)) {
-                html += '<button is="paper-icon-button-light" class="' + btnCssClass + ' cardOverlayFab-primary" data-action="resume"><i class="md-icon cardOverlayButtonIcon cardOverlayButtonIcon-hover">&#xE037;</i></button>';
+                html += '<button is="paper-icon-button-light" class="' + btnCssClass + ' cardOverlayFab-primary" data-action="resume"><i class="md-icon cardOverlayButtonIcon cardOverlayButtonIcon-hover">play_arrow</i></button>';
             }
 
             html += '<div class="cardOverlayButton-br">';
@@ -1483,7 +1465,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
 
             if (itemHelper.canMarkPlayed(item)) {
                 require(['emby-playstatebutton']);
-                html += '<button is="emby-playstatebutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><i class="md-icon cardOverlayButtonIcon cardOverlayButtonIcon-hover">&#xE5CA;</i></button>';
+                html += '<button is="emby-playstatebutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><i class="md-icon cardOverlayButtonIcon cardOverlayButtonIcon-hover">check</i></button>';
             }
 
             if (itemHelper.canRate(item)) {
@@ -1491,10 +1473,10 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
                 var likes = userData.Likes == null ? '' : userData.Likes;
 
                 require(['emby-ratingbutton']);
-                html += '<button is="emby-ratingbutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><i class="md-icon cardOverlayButtonIcon cardOverlayButtonIcon-hover">&#xE87D;</i></button>';
+                html += '<button is="emby-ratingbutton" type="button" data-action="none" class="' + btnCssClass + '" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><i class="md-icon cardOverlayButtonIcon cardOverlayButtonIcon-hover">favorite</i></button>';
             }
 
-            html += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="menu"><i class="md-icon cardOverlayButtonIcon cardOverlayButtonIcon-hover">&#xE5D3;</i></button>';
+            html += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="menu"><i class="md-icon cardOverlayButtonIcon cardOverlayButtonIcon-hover">more_horiz</i></button>';
 
             html += '</div>';
             html += '</div>';
@@ -1507,10 +1489,10 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
                 return '<i class="cardImageIcon md-icon">' + imageHelper.getLibraryIcon(item.CollectionType) + '</i>'
             }
             if (item.Type === 'MusicAlbum') {
-                return '<i class="cardImageIcon md-icon">&#xE019;</i>';
+                return '<i class="cardImageIcon md-icon">album</i>';
             }
             if (item.Type === 'MusicArtist' || item.Type === 'Person') {
-                return '<i class="cardImageIcon md-icon">&#xE7FD;</i>';
+                return '<i class="cardImageIcon md-icon">person</i>';
             }
             if (options.defaultCardImageIcon) {
                 return '<i class="cardImageIcon md-icon">' + options.defaultCardImageIcon + '</i>';
@@ -1602,7 +1584,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
                     indicatorsElem = ensureIndicators(card, indicatorsElem);
                     indicatorsElem.appendChild(playedIndicator);
                 }
-                playedIndicator.innerHTML = '<i class="md-icon indicatorIcon">&#xE5CA;</i>';
+                playedIndicator.innerHTML = '<i class="md-icon indicatorIcon">check</i>';
             } else {
 
                 playedIndicator = card.querySelector('.playedIndicator');
@@ -1656,8 +1638,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
                 }
 
                 itemProgressBar.innerHTML = progressHtml;
-            }
-            else {
+            } else {
 
                 itemProgressBar = card.querySelector('.itemProgressBar');
                 if (itemProgressBar) {
@@ -1684,7 +1665,7 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'focusMana
                 var icon = cell.querySelector('.timerIndicator');
                 if (!icon) {
                     var indicatorsElem = ensureIndicators(cell);
-                    indicatorsElem.insertAdjacentHTML('beforeend', '<i class="md-icon timerIndicator indicatorIcon">&#xE061;</i>');
+                    indicatorsElem.insertAdjacentHTML('beforeend', '<i class="md-icon timerIndicator indicatorIcon">fiber_manual_record</i>');
                 }
                 cell.setAttribute('data-timerid', newTimerId);
             }
diff --git a/src/components/cardbuilder/peoplecardbuilder.js b/src/components/cardbuilder/peoplecardbuilder.js
index e0a5050dc5..5d34d29e6e 100644
--- a/src/components/cardbuilder/peoplecardbuilder.js
+++ b/src/components/cardbuilder/peoplecardbuilder.js
@@ -10,7 +10,7 @@ define(['cardBuilder'], function (cardBuilder) {
             cardFooterAside: 'none',
             showPersonRoleOrType: true,
             cardCssClass: 'personCard',
-            defaultCardImageIcon: '&#xE7FD;'
+            defaultCardImageIcon: 'person'
         });
         cardBuilder.buildCards(items, options);
     }
@@ -19,4 +19,4 @@ define(['cardBuilder'], function (cardBuilder) {
         buildPeopleCards: buildPeopleCards
     };
 
-});
\ No newline at end of file
+});
diff --git a/src/components/channelmapper/channelmapper.js b/src/components/channelmapper/channelmapper.js
index 841a6a81af..0247f79a55 100644
--- a/src/components/channelmapper/channelmapper.js
+++ b/src/components/channelmapper/channelmapper.js
@@ -127,7 +127,7 @@ define(["dialogHelper", "loading", "connectionManager", "globalize", "actionshee
             var html = "";
             var title = globalize.translate("MapChannels");
             html += '<div class="formDialogHeader">';
-            html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
+            html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
             html += '<h3 class="formDialogHeaderTitle">';
             html += title;
             html += "</h3>";
diff --git a/src/components/chromecast/chromecasthelpers.js b/src/components/chromecast/chromecasthelpers.js
index 0beba824c0..9d6f811cb1 100644
--- a/src/components/chromecast/chromecasthelpers.js
+++ b/src/components/chromecast/chromecasthelpers.js
@@ -5,7 +5,7 @@ define(['events'], function (events) {
     //
     // https://github.com/ravisorg/LinkParser
     //
-    // Locate and extract almost any URL within a string. Handles protocol-less domains, IPv4 and 
+    // Locate and extract almost any URL within a string. Handles protocol-less domains, IPv4 and
     // IPv6, unrecognised TLDs, and more.
     //
     // This work is licensed under a Creative Commons Attribution-ShareAlike 4.0 International License.
@@ -14,26 +14,26 @@ define(['events'], function (events) {
 
         // Original URL regex from the Android android.text.util.Linkify function, found here:
         // http://stackoverflow.com/a/19696443
-        // 
-        // However there were problems with it, most probably related to the fact it was 
+        //
+        // However there were problems with it, most probably related to the fact it was
         // written in 2007, and it's been highly modified.
-        // 
-        // 1) I didn't like the fact that it was tied to specific TLDs, since new ones 
+        //
+        // 1) I didn't like the fact that it was tied to specific TLDs, since new ones
         // are being added all the time it wouldn't be reasonable to expect developer to
         // be continually updating their regular expressions.
-        // 
-        // 2) It didn't allow unicode characters in the domains which are now allowed in 
+        //
+        // 2) It didn't allow unicode characters in the domains which are now allowed in
         // many languages, (including some IDN TLDs). Again these are constantly being
         // added to and it doesn't seem reasonable to hard-code them. Note this ended up
         // not being possible in standard JS due to the way it handles multibyte strings.
         // It is possible using XRegExp, however a big performance hit results. Disabled
         // for now.
-        // 
+        //
         // 3) It didn't allow for IPv6 hostnames
         // IPv6 regex from http://stackoverflow.com/a/17871737
         //
         // 4) It was very poorly commented
-        // 
+        //
         // 5) It wasn't as smart as it could have been about what should be part of a
         // URL and what should be part of human language.
 
@@ -102,8 +102,8 @@ define(['events'], function (events) {
             + "|(?:\\%[a-f0-9]{2})"
             // some characters are much more likely to be used AFTER a url and
             // were not intended to be included in the url itself. Mostly end
-            // of sentence type things. It's also likely that the URL would 
-            // still work if any of these characters were missing from the end 
+            // of sentence type things. It's also likely that the URL would
+            // still work if any of these characters were missing from the end
             // because we parsed it incorrectly. For these characters to be accepted
             // they must be followed by another character that we're reasonably
             // sure is part of the url
diff --git a/src/components/chromecast/chromecastplayer.js b/src/components/chromecast/chromecastplayer.js
index f3f7e6b865..7302b74124 100644
--- a/src/components/chromecast/chromecastplayer.js
+++ b/src/components/chromecast/chromecastplayer.js
@@ -479,8 +479,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
                     TotalRecordCount: 1
                 };
             });
-        }
-        else {
+        } else {
 
             query.Limit = query.Limit || 100;
             query.ExcludeLocationTypes = "Virtual";
@@ -752,8 +751,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
 
     ChromecastPlayer.prototype.volumeDown = function () {
         var vol = this._castPlayer.session.receiver.volume.level;
-        if (vol == null)
-        {
+        if (vol == null) {
             vol = 0.5;
         }
         vol -= 0.05;
@@ -776,8 +774,7 @@ define(['appSettings', 'userSettings', 'playbackManager', 'connectionManager', '
 
     ChromecastPlayer.prototype.volumeUp = function () {
         var vol = this._castPlayer.session.receiver.volume.level;
-        if (vol == null)
-        {
+        if (vol == null) {
             vol = 0.5;
         }
         vol += 0.05;
diff --git a/src/components/collectioneditor/collectioneditor.js b/src/components/collectioneditor/collectioneditor.js
index ccb1cdc286..a91594556e 100644
--- a/src/components/collectioneditor/collectioneditor.js
+++ b/src/components/collectioneditor/collectioneditor.js
@@ -243,13 +243,13 @@ define(['dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectionManage
         var title = items.length ? globalize.translate('HeaderAddToCollection') : globalize.translate('NewCollection');
 
         html += '<div class="formDialogHeader">';
-        html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
+        html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
         html += '<h3 class="formDialogHeaderTitle">';
         html += title;
         html += '</h3>';
 
         if (appHost.supports('externallinks')) {
-            html += '<a is="emby-linkbutton" class="button-link btnHelp flex align-items-center" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Collections" target="_blank" style="margin-left:auto;margin-right:.5em;padding:.25em;" title="' + globalize.translate('Help') + '"><i class="md-icon">&#xE88E;</i><span style="margin-left:.25em;">' + globalize.translate('Help') + '</span></a>';
+            html += '<a is="emby-linkbutton" class="button-link btnHelp flex align-items-center" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Collections" target="_blank" style="margin-left:auto;margin-right:.5em;padding:.25em;" title="' + globalize.translate('Help') + '"><i class="md-icon">info</i><span style="margin-left:.25em;">' + globalize.translate('Help') + '</span></a>';
         }
 
         html += '</div>';
@@ -284,4 +284,4 @@ define(['dialogHelper', 'loading', 'apphost', 'layoutManager', 'connectionManage
     };
 
     return CollectionEditor;
-});
\ No newline at end of file
+});
diff --git a/src/components/dialog/dialog.js b/src/components/dialog/dialog.js
index 4f13b2d1bb..cfb5821b38 100644
--- a/src/components/dialog/dialog.js
+++ b/src/components/dialog/dialog.js
@@ -51,7 +51,8 @@ define(['dialogHelper', 'dom', 'layoutManager', 'scrollHelper', 'globalize', 're
             dlg.querySelector('.dialogContentInner').classList.add('hide');
         }
 
-        var i, length;
+        var i;
+        var length;
         var html = '';
         var hasDescriptions = false;
 
diff --git a/src/components/dialogHelper/dialogHelper.js b/src/components/dialogHelper/dialogHelper.js
index 36bb23bfd7..bddd839760 100644
--- a/src/components/dialogHelper/dialogHelper.js
+++ b/src/components/dialogHelper/dialogHelper.js
@@ -18,8 +18,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
         if (layoutManager.tv) {
             if (dlg.classList.contains('scrollX')) {
                 centerFocus(dlg, true, false);
-            }
-            else if (dlg.classList.contains('smoothScrollY')) {
+            } else if (dlg.classList.contains('smoothScrollY')) {
                 centerFocus(dlg, false, false);
             }
         }
@@ -168,8 +167,8 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
                 close(dlg);
             }
         }, {
-                passive: true
-            });
+            passive: true
+        });
     }
 
     function isHistoryEnabled(dlg) {
@@ -433,8 +432,7 @@ define(['appRouter', 'focusManager', 'browser', 'layoutManager', 'inputManager',
             if (layoutManager.tv) {
                 centerFocus(dlg, true, true);
             }
-        }
-        else if (options.scrollY !== false) {
+        } else if (options.scrollY !== false) {
             dlg.classList.add('smoothScrollY');
 
             if (layoutManager.tv) {
diff --git a/src/components/directorybrowser/directorybrowser.js b/src/components/directorybrowser/directorybrowser.js
index aac45f86d6..ef51ce45b5 100644
--- a/src/components/directorybrowser/directorybrowser.js
+++ b/src/components/directorybrowser/directorybrowser.js
@@ -115,7 +115,7 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'paper-
         var readOnlyAttribute = options.pathReadOnly ? " readonly" : "";
         html += '<input is="emby-input" id="txtDirectoryPickerPath" type="text" required="required" ' + readOnlyAttribute + ' label="' + Globalize.translate(labelKey) + '"/>';
         html += "</div>";
-        if (!readOnlyAttribute)  {
+        if (!readOnlyAttribute) {
             html += '<button type="button" is="paper-icon-button-light" class="btnRefreshDirectories emby-input-iconbutton" title="' + Globalize.translate("ButtonRefresh") + '"><i class="md-icon">search</i></button>';
         }
         html += "</div>";
@@ -188,9 +188,9 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'paper-
                 var path = lnkPath.getAttribute("data-path");
                 if (lnkPath.classList.contains("lnkFile")) {
                     content.querySelector("#txtDirectoryPickerPath").value = path;
-                 } else {
+                } else {
                     refreshDirectoryBrowser(content, path, fileOptions, true)
-                 };
+                }
             }
         });
 
@@ -254,10 +254,10 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'paper-
                     var systemInfo = responses[0];
                     var initialPath = responses[1];
                     var dlg = dialogHelper.createDialog({
-                            size: "medium-tall",
-                            removeOnClose: true,
-                            scrollY: false
-                        });
+                        size: "medium-tall",
+                        removeOnClose: true,
+                        scrollY: false
+                    });
                     dlg.classList.add("ui-body-a");
                     dlg.classList.add("background-theme-a");
                     dlg.classList.add("directoryPicker");
@@ -265,7 +265,7 @@ define(['loading', 'dialogHelper', 'dom', 'listViewStyle', 'emby-input', 'paper-
 
                     var html = "";
                     html += '<div class="formDialogHeader">';
-                    html += '<button is="paper-icon-button-light" class="btnCloseDialog autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
+                    html += '<button is="paper-icon-button-light" class="btnCloseDialog autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
                     html += '<h3 class="formDialogHeaderTitle">';
                     html += options.header || Globalize.translate("HeaderSelectPath");
                     html += "</h3>";
diff --git a/src/components/dom.js b/src/components/dom.js
index ea8902b98e..da03b87428 100644
--- a/src/components/dom.js
+++ b/src/components/dom.js
@@ -68,7 +68,9 @@ define([], function () {
             }
         });
         window.addEventListener("test", null, opts);
-    } catch (e) { }
+    } catch (e) {
+        console.log('error checking capture support');
+    }
 
     function addEventListenerWithOptions(target, type, handler, options) {
         var optionsOrCapture = options;
@@ -116,8 +118,8 @@ define([], function () {
             return _animationEvent;
         }
 
-        var t,
-            el = document.createElement("div");
+        var t;
+        var el = document.createElement("div");
         var animations = {
             "animation": "animationend",
             "OAnimation": "oAnimationEnd",
@@ -146,8 +148,8 @@ define([], function () {
             return _transitionEvent;
         }
 
-        var t,
-            el = document.createElement("div");
+        var t;
+        var el = document.createElement("div");
         var transitions = {
             "transition": "transitionend",
             "OTransition": "oTransitionEnd",
diff --git a/src/components/emby-checkbox/emby-checkbox.js b/src/components/emby-checkbox/emby-checkbox.js
index 1721bf3ca7..d6276e826c 100644
--- a/src/components/emby-checkbox/emby-checkbox.js
+++ b/src/components/emby-checkbox/emby-checkbox.js
@@ -54,7 +54,7 @@ define(['browser', 'dom', 'css!./emby-checkbox', 'registerElement'], function (b
             outlineClass += ' ' + customClass;
         }
 
-        var checkedIcon = this.getAttribute('data-checkedicon') || '&#xE5CA;';
+        var checkedIcon = this.getAttribute('data-checkedicon') || 'check';
         var uncheckedIcon = this.getAttribute('data-uncheckedicon') || '';
         var checkHtml = '<i class="md-icon checkboxIcon checkboxIcon-checked">' + checkedIcon + '</i>';
         var uncheckedHtml = '<i class="md-icon checkboxIcon checkboxIcon-unchecked">' + uncheckedIcon + '</i>';
diff --git a/src/components/emby-input/emby-input.js b/src/components/emby-input/emby-input.js
index acc9154318..7d2ea63a0d 100644
--- a/src/components/emby-input/emby-input.js
+++ b/src/components/emby-input/emby-input.js
@@ -28,11 +28,12 @@ define(['layoutManager', 'browser', 'dom', 'css!./emby-input', 'registerElement'
     }
 
     EmbyInputPrototype.createdCallback = function () {
-
         if (!this.id) {
             this.id = 'embyinput' + inputId;
             inputId++;
-        } if (this.classList.contains('emby-input')) {
+        }
+
+        if (this.classList.contains('emby-input')) {
             return;
         }
 
diff --git a/src/components/emby-progressring/emby-progressring.js b/src/components/emby-progressring/emby-progressring.js
index 7148079a19..80c5458528 100644
--- a/src/components/emby-progressring/emby-progressring.js
+++ b/src/components/emby-progressring/emby-progressring.js
@@ -47,8 +47,7 @@ define(['require', 'css!./emby-progressring', 'registerElement'], function (requ
             this.querySelector('.animate-25-50-b').style.transform = 'rotate(-90deg)';
             this.querySelector('.animate-50-75-b').style.transform = 'rotate(-90deg)';
             this.querySelector('.animate-75-100-b').style.transform = 'rotate(-90deg)';
-        }
-        else if (progress >= 25 && progress < 50) {
+        } else if (progress >= 25 && progress < 50) {
 
             angle = -90 + ((progress - 25) / 100) * 360;
 
@@ -57,8 +56,7 @@ define(['require', 'css!./emby-progressring', 'registerElement'], function (requ
 
             this.querySelector('.animate-50-75-b').style.transform = 'rotate(-90deg)';
             this.querySelector('.animate-75-100-b').style.transform = 'rotate(-90deg)';
-        }
-        else if (progress >= 50 && progress < 75) {
+        } else if (progress >= 50 && progress < 75) {
             angle = -90 + ((progress - 50) / 100) * 360;
 
             this.querySelector('.animate-0-25-b').style.transform = 'none';
@@ -66,8 +64,7 @@ define(['require', 'css!./emby-progressring', 'registerElement'], function (requ
             this.querySelector('.animate-50-75-b').style.transform = 'rotate(' + angle + 'deg)';
 
             this.querySelector('.animate-75-100-b').style.transform = 'rotate(-90deg)';
-        }
-        else if (progress >= 75 && progress <= 100) {
+        } else if (progress >= 75 && progress <= 100) {
             angle = -90 + ((progress - 75) / 100) * 360;
 
             this.querySelector('.animate-0-25-b').style.transform = 'none';
@@ -85,7 +82,6 @@ define(['require', 'css!./emby-progressring', 'registerElement'], function (requ
 
     EmbyProgressRing.detachedCallback = function () {
 
-
         var observer = this.observer;
 
         if (observer) {
diff --git a/src/components/emby-scrollbuttons/emby-scrollbuttons.js b/src/components/emby-scrollbuttons/emby-scrollbuttons.js
index 37638a1b89..deec96d9a2 100644
--- a/src/components/emby-scrollbuttons/emby-scrollbuttons.js
+++ b/src/components/emby-scrollbuttons/emby-scrollbuttons.js
@@ -7,7 +7,7 @@ define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'registerElement', '
 
     function getScrollButtonHtml(direction) {
         var html = '';
-        var icon = direction === 'left' ? '&#xE5CB;' : '&#xE5CC;';
+        var icon = direction === 'left' ? 'chevron_left' : 'chevron_right';
 
         html += '<button type="button" is="paper-icon-button-light" data-ripple="false" data-direction="' + direction + '" class="emby-scrollbuttons-button">';
         html += '<i class="md-icon">' + icon + '</i>';
@@ -175,4 +175,4 @@ define(['layoutManager', 'dom', 'css!./emby-scrollbuttons', 'registerElement', '
         prototype: EmbyScrollButtonsPrototype,
         extends: 'div'
     });
-});
\ No newline at end of file
+});
diff --git a/src/components/emby-select/emby-select.js b/src/components/emby-select/emby-select.js
index 3cf4d6774d..248e7ce570 100644
--- a/src/components/emby-select/emby-select.js
+++ b/src/components/emby-select/emby-select.js
@@ -144,7 +144,7 @@ define(['layoutManager', 'browser', 'actionsheet', 'css!./emby-select', 'registe
         this.parentNode.insertBefore(label, this);
 
         if (this.classList.contains('emby-select-withcolor')) {
-            this.parentNode.insertAdjacentHTML('beforeend', '<div class="selectArrowContainer"><div style="visibility:hidden;">0</div><i class="selectArrow md-icon">&#xE313;</i></div>');
+            this.parentNode.insertAdjacentHTML('beforeend', '<div class="selectArrowContainer"><div style="visibility:hidden;">0</div><i class="selectArrow md-icon">keyboard_arrow_down</i></div>');
         }
     };
 
diff --git a/src/components/emby-tabs/emby-tabs.js b/src/components/emby-tabs/emby-tabs.js
index 4a0060cf88..9fedf0bfe9 100644
--- a/src/components/emby-tabs/emby-tabs.js
+++ b/src/components/emby-tabs/emby-tabs.js
@@ -142,7 +142,7 @@ define(['dom', 'scroller', 'browser', 'layoutManager', 'focusManager', 'register
             tabs.classList.add('scrollX');
             tabs.classList.add('hiddenScrollX');
             tabs.classList.add('smoothScrollX');
-       }
+        }
     }
 
     EmbyTabs.createdCallback = function () {
diff --git a/src/components/emby-textarea/emby-textarea.js b/src/components/emby-textarea/emby-textarea.js
index 7dec1f0955..c500db6e1f 100644
--- a/src/components/emby-textarea/emby-textarea.js
+++ b/src/components/emby-textarea/emby-textarea.js
@@ -14,9 +14,9 @@ define(['layoutManager', 'browser', 'css!./emby-textarea', 'registerElement', 'e
          * @returns {number}
          */
         self.getOffset = function (textarea) {
-            var style = window.getComputedStyle(textarea, null),
-                props = ['paddingTop', 'paddingBottom'],
-                offset = 0;
+            var style = window.getComputedStyle(textarea, null);
+            var props = ['paddingTop', 'paddingBottom'];
+            var offset = 0;
 
             for (var i = 0; i < props.length; i++) {
                 offset += parseInt(style[props[i]]);
@@ -43,13 +43,13 @@ define(['layoutManager', 'browser', 'css!./emby-textarea', 'registerElement', 'e
                 textarea.rows = 3;
                 return;
             }
-            var newHeight = 0, hasGrown = false;
+            var newHeight = 0;
+            var hasGrown = false;
 
             if ((textarea.scrollHeight - offset) > self.maxAllowedHeight) {
                 textarea.style.overflowY = 'scroll';
                 newHeight = self.maxAllowedHeight;
-            }
-            else {
+            } else {
                 textarea.style.overflowY = 'hidden';
                 textarea.style.height = 'auto';
                 newHeight = textarea.scrollHeight/* - offset*/;
diff --git a/src/components/favoriteitems.js b/src/components/favoriteitems.js
index c84d84f585..17129ea54e 100644
--- a/src/components/favoriteitems.js
+++ b/src/components/favoriteitems.js
@@ -136,7 +136,7 @@ define(["loading", "libraryBrowser", "cardBuilder", "dom", "apphost", "imageLoad
                     html += '<h2 class="sectionTitle sectionTitle-cards">';
                     html += globalize.translate(section.name);
                     html += "</h2>";
-                    html += '<i class="md-icon">&#xE5CC;</i>';
+                    html += '<i class="md-icon">chevron_right</i>';
                     html += "</a>";
                 } else {
                     html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate(section.name) + "</h2>";
diff --git a/src/components/filtermenu/filtermenu.js b/src/components/filtermenu/filtermenu.js
index 89457aa4e6..f2196bf632 100644
--- a/src/components/filtermenu/filtermenu.js
+++ b/src/components/filtermenu/filtermenu.js
@@ -94,7 +94,8 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
         context.querySelector('form').addEventListener('submit', onSubmit);
 
         var elems = context.querySelectorAll('.simpleFilter');
-        var i, length;
+        var i;
+        var length;
 
         for (i = 0, length = elems.length; i < length; i++) {
 
@@ -137,7 +138,8 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
     function saveValues(context, settings, settingsKey) {
 
         var elems = context.querySelectorAll('.simpleFilter');
-        var i, length;
+        var i;
+        var length;
         for (i = 0, length = elems.length; i < length; i++) {
 
             if (elems[i].tagName === 'INPUT') {
@@ -277,7 +279,7 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
                 var html = '';
 
                 html += '<div class="formDialogHeader">';
-                html += '<button is="paper-icon-button-light" class="btnCancel hide-mouse-idle-tv" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
+                html += '<button is="paper-icon-button-light" class="btnCancel hide-mouse-idle-tv" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
                 html += '<h3 class="formDialogHeaderTitle">${Filters}</h3>';
 
                 html += '</div>';
@@ -345,4 +347,4 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'apphost',
     };
 
     return FilterMenu;
-});
\ No newline at end of file
+});
diff --git a/src/components/focusManager.js b/src/components/focusManager.js
index aaa7dda30e..56ff324e23 100644
--- a/src/components/focusManager.js
+++ b/src/components/focusManager.js
@@ -99,7 +99,7 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
         return normalizeFocusable(elem, originalElement);
     }
 
-    // Determines if a focusable element can be focused at a given point in time 
+    // Determines if a focusable element can be focused at a given point in time
     function isCurrentlyFocusableInternal(elem) {
 
         // http://stackoverflow.com/questions/19669786/check-if-element-is-visible-in-dom
@@ -110,7 +110,7 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
         return true;
     }
 
-    // Determines if a focusable element can be focused at a given point in time 
+    // Determines if a focusable element can be focused at a given point in time
     function isCurrentlyFocusable(elem) {
 
         if (elem.disabled) {
@@ -181,21 +181,18 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
             if (classList.contains('focuscontainer-left')) {
                 return true;
             }
-        }
-        else if (direction === 1) {
+        } else if (direction === 1) {
             if (classList.contains('focuscontainer-x')) {
                 return true;
             }
             if (classList.contains('focuscontainer-right')) {
                 return true;
             }
-        }
-        else if (direction === 2) {
+        } else if (direction === 2) {
             if (classList.contains('focuscontainer-y')) {
                 return true;
             }
-        }
-        else if (direction === 3) {
+        } else if (direction === 3) {
             if (classList.contains('focuscontainer-y')) {
                 return true;
             }
@@ -275,14 +272,14 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
         var rect = getOffset(activeElement);
 
         // Get elements and work out x/y points
-        var cache = [],
-            point1x = parseFloat(rect.left) || 0,
-            point1y = parseFloat(rect.top) || 0,
-            point2x = parseFloat(point1x + rect.width - 1) || point1x,
-            point2y = parseFloat(point1y + rect.height - 1) || point1y,
-            // Shortcuts to help with compression
-            min = Math.min,
-            max = Math.max;
+        var cache = [];
+        var point1x = parseFloat(rect.left) || 0;
+        var point1y = parseFloat(rect.top) || 0;
+        var point2x = parseFloat(point1x + rect.width - 1) || point1x;
+        var point2y = parseFloat(point1y + rect.height - 1) || point1y;
+        // Shortcuts to help with compression
+        var min = Math.min;
+        var max = Math.max;
 
         var sourceMidX = rect.left + (rect.width / 2);
         var sourceMidY = rect.top + (rect.height / 2);
@@ -357,10 +354,10 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
                     break;
             }
 
-            var x = elementRect.left,
-                y = elementRect.top,
-                x2 = x + elementRect.width - 1,
-                y2 = y + elementRect.height - 1;
+            var x = elementRect.left;
+            var y = elementRect.top;
+            var x2 = x + elementRect.width - 1;
+            var y2 = y + elementRect.height - 1;
 
             var intersectX = intersects(point1x, point2x, x, x2);
             var intersectY = intersects(point1y, point2y, y, y2);
@@ -470,7 +467,9 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
 
         var elems = container.querySelectorAll(focusableSelector);
         var list = [];
-        var i, length, elem;
+        var i;
+        var length;
+        var elem;
 
         for (i = 0, length = elems.length; i < length; i++) {
 
@@ -513,32 +512,24 @@ define(['dom', 'scrollManager'], function (dom, scrollManager) {
         focusableParent: focusableParent,
         getFocusableElements: getFocusableElements,
         moveLeft: function (sourceElement, options) {
-
             var container = options ? options.container : null;
             var focusableElements = options ? options.focusableElements : null;
             nav(sourceElement, 0, container, focusableElements);
-
         },
         moveRight: function (sourceElement, options) {
-
             var container = options ? options.container : null;
             var focusableElements = options ? options.focusableElements : null;
             nav(sourceElement, 1, container, focusableElements);
-
         },
         moveUp: function (sourceElement, options) {
-
             var container = options ? options.container : null;
             var focusableElements = options ? options.focusableElements : null;
             nav(sourceElement, 2, container, focusableElements);
-
         },
         moveDown: function (sourceElement, options) {
-
             var container = options ? options.container : null;
             var focusableElements = options ? options.focusableElements : null;
             nav(sourceElement, 3, container, focusableElements);
-
         },
         sendText: sendText,
         isCurrentlyFocusable: isCurrentlyFocusable,
diff --git a/src/components/fullscreenManager.js b/src/components/fullscreenManager.js
index 360986cc54..8ae31073a2 100644
--- a/src/components/fullscreenManager.js
+++ b/src/components/fullscreenManager.js
@@ -55,7 +55,7 @@ define(['events', 'dom', 'apphost', 'browser'], function (events, dom, appHost,
         return document.fullscreen ||
             document.mozFullScreen ||
             document.webkitIsFullScreen ||
-            document.msFullscreenElement ||  /* IE/Edge syntax */
+            document.msFullscreenElement || /* IE/Edge syntax */
             document.fullscreenElement || /* Standard syntax */
             document.webkitFullscreenElement || /* Chrome, Safari and Opera syntax */
             document.mozFullScreenElement; /* Firefox syntax */
diff --git a/src/components/guide/guide-settings.js b/src/components/guide/guide-settings.js
index 47eb026db8..9ee43be9f1 100644
--- a/src/components/guide/guide-settings.js
+++ b/src/components/guide/guide-settings.js
@@ -39,7 +39,8 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
 
     function save(context) {
 
-        var i, length;
+        var i;
+        var length;
 
         var chkIndicators = context.querySelectorAll('.chkIndicator');
         for (i = 0, length = chkIndicators.length; i < length; i++) {
@@ -62,7 +63,8 @@ define(['dialogHelper', 'globalize', 'userSettings', 'layoutManager', 'connectio
 
     function load(context) {
 
-        var i, length;
+        var i;
+        var length;
 
         var chkIndicators = context.querySelectorAll('.chkIndicator');
         for (i = 0, length = chkIndicators.length; i < length; i++) {
diff --git a/src/components/guide/guide-settings.template.html b/src/components/guide/guide-settings.template.html
index 605c408a85..d85b4a71b9 100644
--- a/src/components/guide/guide-settings.template.html
+++ b/src/components/guide/guide-settings.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
     <h3 class="formDialogHeaderTitle">
         ${Settings}
     </h3>
@@ -65,4 +65,4 @@
         </div>
 
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/components/guide/guide.js b/src/components/guide/guide.js
index d299d7fd7c..c8ed31df0f 100644
--- a/src/components/guide/guide.js
+++ b/src/components/guide/guide.js
@@ -277,7 +277,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             var nextDay = new Date(date.getTime() + msPerDay - 2000);
 
             // Normally we'd want to just let responsive css handle this,
-            // but since mobile browsers are often underpowered, 
+            // but since mobile browsers are often underpowered,
             // it can help performance to get them out of the markup
             var allowIndicators = dom.getWindowSize().innerWidth >= 600;
 
@@ -392,27 +392,20 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
         }
 
         function parseDates(program) {
-
             if (!program.StartDateLocal) {
                 try {
-
                     program.StartDateLocal = datetime.parseISO8601Date(program.StartDate, { toLocal: true });
-
                 } catch (err) {
-
+                    console.log('error parsing timestamp for start date');
                 }
-
             }
 
             if (!program.EndDateLocal) {
                 try {
-
                     program.EndDateLocal = datetime.parseISO8601Date(program.EndDate, { toLocal: true });
-
                 } catch (err) {
-
+                    console.log('error parsing timestamp for end date');
                 }
-
             }
 
             return null;
@@ -423,30 +416,27 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             var status;
 
             if (item.Type === 'SeriesTimer') {
-                return '<i class="md-icon programIcon seriesTimerIcon">&#xE062;</i>';
-            }
-            else if (item.TimerId || item.SeriesTimerId) {
+                return '<i class="md-icon programIcon seriesTimerIcon">fiber_smart_record</i>';
+            } else if (item.TimerId || item.SeriesTimerId) {
 
                 status = item.Status || 'Cancelled';
-            }
-            else if (item.Type === 'Timer') {
+            } else if (item.Type === 'Timer') {
 
                 status = item.Status;
-            }
-            else {
+            } else {
                 return '';
             }
 
             if (item.SeriesTimerId) {
 
                 if (status !== 'Cancelled') {
-                    return '<i class="md-icon programIcon seriesTimerIcon">&#xE062;</i>';
+                    return '<i class="md-icon programIcon seriesTimerIcon">fiber_smart_record</i>';
                 }
 
-                return '<i class="md-icon programIcon seriesTimerIcon seriesTimerIcon-inactive">&#xE062;</i>';
+                return '<i class="md-icon programIcon seriesTimerIcon seriesTimerIcon-inactive">fiber_smart_record</i>';
             }
 
-            return '<i class="md-icon programIcon timerIcon">&#xE061;</i>';
+            return '<i class="md-icon programIcon timerIcon">fiber_manual_record</i>';
         }
 
         function getChannelProgramsHtml(context, date, channel, programs, options, listInfo) {
@@ -529,11 +519,9 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
                 } else if (program.IsMovie) {
                     displayInnerContent = displayMovieContent;
                     accentCssClass = 'movie';
-                }
-                else if (program.IsSeries) {
+                } else if (program.IsSeries) {
                     displayInnerContent = displaySeriesContent;
-                }
-                else {
+                } else {
                     displayInnerContent = displayMovieContent && displayNewsContent && displaySportsContent && displayKidsContent && displaySeriesContent;
                 }
 
@@ -562,21 +550,18 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
                     html += '<div class="' + guideProgramNameClass + '">';
 
-                    html += '<div class="guide-programNameCaret hide"><i class="guideProgramNameCaretIcon md-icon">&#xE314;</i></div>';
+                    html += '<div class="guide-programNameCaret hide"><i class="guideProgramNameCaretIcon md-icon">keyboard_arrow_left</i></div>';
 
                     html += '<div class="guideProgramNameText">' + program.Name;
 
                     var indicatorHtml = null;
                     if (program.IsLive && options.showLiveIndicator) {
                         indicatorHtml = '<span class="liveTvProgram guideProgramIndicator">' + globalize.translate('Live') + '</span>';
-                    }
-                    else if (program.IsPremiere && options.showPremiereIndicator) {
+                    } else if (program.IsPremiere && options.showPremiereIndicator) {
                         indicatorHtml = '<span class="premiereTvProgram guideProgramIndicator">' + globalize.translate('Premiere') + '</span>';
-                    }
-                    else if (program.IsSeries && !program.IsRepeat && options.showNewIndicator) {
+                    } else if (program.IsSeries && !program.IsRepeat && options.showNewIndicator) {
                         indicatorHtml = '<span class="newTvProgram guideProgramIndicator">' + globalize.translate('AttributeNew') + '</span>';
-                    }
-                    else if (program.IsSeries && program.IsRepeat && options.showRepeatIndicator) {
+                    } else if (program.IsSeries && program.IsRepeat && options.showRepeatIndicator) {
                         indicatorHtml = '<span class="repeatTvProgram guideProgramIndicator">' + globalize.translate('Repeat') + '</span>';
                     }
                     html += indicatorHtml || '';
@@ -614,7 +599,6 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             return html;
         }
 
-
         function renderChannelHeaders(context, channels, apiClient) {
 
             var html = '';
@@ -1079,17 +1063,13 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
                     scrollHelper.toStart(programGrid, programCell, true, true);
                 }
-            }
-
-            else if (lastFocusDirection === 'right') {
+            } else if (lastFocusDirection === 'right') {
 
                 if (programCell) {
 
                     scrollHelper.toCenter(programGrid, programCell, true, true);
                 }
-            }
-
-            else if (lastFocusDirection === 'up' || lastFocusDirection === 'down') {
+            } else if (lastFocusDirection === 'up' || lastFocusDirection === 'down') {
 
                 var verticalScroller = dom.parentWithClass(target, 'guideVerticalScroller');
                 if (verticalScroller) {
@@ -1126,7 +1106,7 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
 
                 var icon = cell.querySelector('.timerIcon');
                 if (!icon) {
-                    cell.querySelector('.guideProgramName').insertAdjacentHTML('beforeend', '<i class="timerIcon md-icon programIcon">&#xE061;</i>');
+                    cell.querySelector('.guideProgramName').insertAdjacentHTML('beforeend', '<i class="timerIcon md-icon programIcon">fiber_manual_record</i>');
                 }
 
                 if (newTimerId) {
@@ -1195,14 +1175,14 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
             dom.addEventListener(programGrid, 'scroll', function (e) {
                 onProgramGridScroll(context, this, timeslotHeaders);
             }, {
-                    passive: true
-                });
+                passive: true
+            });
 
             dom.addEventListener(timeslotHeaders, 'scroll', function () {
                 onTimeslotHeadersScroll(context, this);
             }, {
-                    passive: true
-                });
+                passive: true
+            });
 
             programGrid.addEventListener('click', onProgramGridClick);
 
@@ -1287,4 +1267,4 @@ define(['require', 'inputManager', 'browser', 'globalize', 'connectionManager',
     });
 
     return Guide;
-});
\ No newline at end of file
+});
diff --git a/src/components/guide/tvguide.template.html b/src/components/guide/tvguide.template.html
index 8778fcd3f7..7edffec6d1 100644
--- a/src/components/guide/tvguide.template.html
+++ b/src/components/guide/tvguide.template.html
@@ -10,7 +10,7 @@
     <div class="guide-headerTimeslots">
         <div class="guide-channelTimeslotHeader">
             <button is="paper-icon-button-light" type="button" class="btnGuideViewSettings">
-                <i class="md-icon btnGuideViewSettingsIcon">&#xE5D3;</i>
+                <i class="md-icon btnGuideViewSettingsIcon">more_horiz</i>
             </button>
         </div>
         <div class="timeslotHeaders scrollX guideScroller"></div>
@@ -30,9 +30,9 @@
 
 <div class="guideOptions hide">
     <button is="paper-icon-button-light" type="button" class="btnPreviousPage">
-        <i class="md-icon">&#xE5C4;</i>
+        <i class="md-icon">arrow_back</i>
     </button>
     <button is="paper-icon-button-light" type="button" class="btnNextPage">
-        <i class="md-icon">&#xE5C8;</i>
+        <i class="md-icon">arrow_forward</i>
     </button>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/components/headroom/headroom.js b/src/components/headroom/headroom.js
index a3cc5b0435..9c058a8e82 100644
--- a/src/components/headroom/headroom.js
+++ b/src/components/headroom/headroom.js
@@ -255,8 +255,8 @@ define(['dom', 'layoutManager', 'browser', 'css!./headroom'], function (dom, lay
          * @return {bool} true if should unpin, false otherwise
          */
         this.shouldUnpin = function (currentScrollY) {
-            var scrollingDown = currentScrollY > this.lastKnownScrollY,
-                pastOffset = currentScrollY >= this.offset;
+            var scrollingDown = currentScrollY > this.lastKnownScrollY;
+            var pastOffset = currentScrollY >= this.offset;
 
             return scrollingDown && pastOffset;
         };
@@ -267,8 +267,8 @@ define(['dom', 'layoutManager', 'browser', 'css!./headroom'], function (dom, lay
          * @return {bool} true if should pin, false otherwise
          */
         this.shouldPin = function (currentScrollY) {
-            var scrollingUp = currentScrollY < this.lastKnownScrollY,
-                pastOffset = currentScrollY <= this.offset;
+            var scrollingUp = currentScrollY < this.lastKnownScrollY;
+            var pastOffset = currentScrollY <= this.offset;
 
             return scrollingUp || pastOffset;
         };
@@ -290,11 +290,9 @@ define(['dom', 'layoutManager', 'browser', 'css!./headroom'], function (dom, lay
 
             if (currentScrollY <= (isTv ? 120 : 10)) {
                 this.clear();
-            }
-            else if (this.shouldUnpin(currentScrollY)) {
+            } else if (this.shouldUnpin(currentScrollY)) {
                 this.unpin();
-            }
-            else if (this.shouldPin(currentScrollY)) {
+            } else if (this.shouldPin(currentScrollY)) {
 
                 var toleranceExceeded = Math.abs(currentScrollY - lastKnownScrollY) >= 14;
 
@@ -310,7 +308,6 @@ define(['dom', 'layoutManager', 'browser', 'css!./headroom'], function (dom, lay
             this.lastKnownScrollY = currentScrollY;
         };
 
-      
         if (browser.supportsCssAnimation()) {
             for (var i = 0, length = this.elems.length; i < length; i++) {
                 this.elems[i].classList.add(this.initialClass);
diff --git a/src/components/homescreensettings/homescreensettings.js b/src/components/homescreensettings/homescreensettings.js
index 633437d26e..5b966327eb 100644
--- a/src/components/homescreensettings/homescreensettings.js
+++ b/src/components/homescreensettings/homescreensettings.js
@@ -57,8 +57,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
                 name: globalize.translate('Collections'),
                 value: 'collections'
             });
-        }
-        else if (type === 'tvshows') {
+        } else if (type === 'tvshows') {
 
             list.push({
                 name: globalize.translate('Shows'),
@@ -78,8 +77,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
                 name: globalize.translate('Favorites'),
                 value: 'favorites'
             });
-        }
-        else if (type === 'music') {
+        } else if (type === 'music') {
 
             list.push({
                 name: globalize.translate('Suggestions'),
@@ -111,8 +109,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
                 name: globalize.translate('Genres'),
                 value: 'genres'
             });
-        }
-        else if (type === 'livetv') {
+        } else if (type === 'livetv') {
 
             list.push({
                 name: globalize.translate('Suggestions'),
@@ -152,7 +149,7 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
             currentHtml += '<div class="listItem viewItem" data-viewid="' + view.Id + '">';
 
-            currentHtml += '<i class="md-icon listItemIcon">&#xE2C8;</i>';
+            currentHtml += '<i class="md-icon listItemIcon">folder_open</i>';
 
             currentHtml += '<div class="listItemBody">';
 
@@ -162,8 +159,8 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
             currentHtml += '</div>';
 
-            currentHtml += '<button type="button" is="paper-icon-button-light" class="btnViewItemUp btnViewItemMove autoSize" title="' + globalize.translate('Up') + '"><i class="md-icon">&#xE316;</i></button>';
-            currentHtml += '<button type="button" is="paper-icon-button-light" class="btnViewItemDown btnViewItemMove autoSize" title="' + globalize.translate('Down') + '"><i class="md-icon">&#xE313;</i></button>';
+            currentHtml += '<button type="button" is="paper-icon-button-light" class="btnViewItemUp btnViewItemMove autoSize" title="' + globalize.translate('Up') + '"><i class="md-icon">keyboard_arrow_up</i></button>';
+            currentHtml += '<button type="button" is="paper-icon-button-light" class="btnViewItemDown btnViewItemMove autoSize" title="' + globalize.translate('Down') + '"><i class="md-icon">keyboard_arrow_down</i></button>';
 
             currentHtml += '</div>';
 
@@ -256,7 +253,6 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
             html += '</div>';
         }
 
-
         return html;
     }
 
@@ -384,7 +380,8 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
 
         var viewItems = context.querySelectorAll('.viewItem');
         var orderedViews = [];
-        var i, length;
+        var i;
+        var length;
         for (i = 0, length = viewItems.length; i < length; i++) {
             orderedViews.push(viewItems[i].getAttribute('data-viewid'));
         }
@@ -542,4 +539,4 @@ define(['require', 'apphost', 'layoutManager', 'focusManager', 'globalize', 'loa
     };
 
     return HomeScreenSettings;
-});
\ No newline at end of file
+});
diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js
index 3fc549e6e4..3f86e16796 100644
--- a/src/components/homesections/homesections.js
+++ b/src/components/homesections/homesections.js
@@ -1,4 +1,4 @@
-define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'layoutManager', 'imageLoader', 'globalize', 'itemShortcuts', 'itemHelper', 'appRouter', 'scripts/imagehelper','paper-icon-button-light', 'emby-itemscontainer', 'emby-scroller', 'emby-button', 'css!./homesections'], function (connectionManager, cardBuilder, appSettings, dom, appHost, layoutManager, imageLoader, globalize, itemShortcuts, itemHelper, appRouter, imageHelper) {
+define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'layoutManager', 'imageLoader', 'globalize', 'itemShortcuts', 'itemHelper', 'appRouter', 'scripts/imagehelper', 'paper-icon-button-light', 'emby-itemscontainer', 'emby-scroller', 'emby-button', 'css!./homesections'], function (connectionManager, cardBuilder, appSettings, dom, appHost, layoutManager, imageLoader, globalize, itemShortcuts, itemHelper, appRouter, imageHelper) {
     'use strict';
 
     function getDefaultSection(index) {
@@ -83,7 +83,8 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
     function resume(elem, options) {
         var elems = elem.querySelectorAll('.itemsContainer');
-        var i, length;
+        var i;
+        var length;
         var promises = [];
 
         for (i = 0, length = elems.length; i < length; i++) {
@@ -259,7 +260,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
             html += '<h2 class="sectionTitle sectionTitle-cards">';
             html += globalize.translate('LatestFromLibrary', parent.Name);
             html += '</h2>';
-            html += '<i class="md-icon">&#xE5CC;</i>';
+            html += '<i class="md-icon">chevron_right</i>';
             html += '</a>';
         } else {
             html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate('LatestFromLibrary', parent.Name) + '</h2>';
@@ -567,7 +568,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
 
                 html += '<a is="emby-linkbutton" href="' + appRouter.getRouteUrl('livetv', {
                     serverId: apiClient.serverId(),
-					section: 'programs'
+                    section: 'programs'
                 }) + '" class="raised"><span>' + globalize.translate('Programs') + '</span></a>';
 
                 html += '<a is="emby-linkbutton" href="' + appRouter.getRouteUrl('livetv', {
@@ -607,7 +608,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
                     html += '<h2 class="sectionTitle sectionTitle-cards">';
                     html += globalize.translate('HeaderOnNow');
                     html += '</h2>';
-                    html += '<i class="md-icon">&#xE5CC;</i>';
+                    html += '<i class="md-icon">chevron_right</i>';
                     html += '</a>';
 
                 } else {
@@ -682,7 +683,7 @@ define(['connectionManager', 'cardBuilder', 'appSettings', 'dom', 'apphost', 'la
             html += '<h2 class="sectionTitle sectionTitle-cards">';
             html += globalize.translate('HeaderNextUp');
             html += '</h2>';
-            html += '<i class="md-icon">&#xE5CC;</i>';
+            html += '<i class="md-icon">chevron_right</i>';
             html += '</a>';
         } else {
             html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate('HeaderNextUp') + '</h2>';
diff --git a/src/components/htmlMediaHelper.js b/src/components/htmlMediaHelper.js
index bba0ec2daf..86f05dabfa 100644
--- a/src/components/htmlMediaHelper.js
+++ b/src/components/htmlMediaHelper.js
@@ -12,7 +12,6 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
     }
 
     function getCrossOriginValue(mediaSource) {
-
         if (mediaSource.IsRemote) {
             return null;
         }
@@ -97,7 +96,8 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         return true;
     }
 
-    var recoverDecodingErrorDate, recoverSwapAudioCodecDate;
+    var recoverDecodingErrorDate;
+    var recoverSwapAudioCodecDate;
     function handleHlsJsMediaError(instance, reject) {
 
         var hlsPlayer = instance._hlsPlayer;
@@ -144,7 +144,8 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
         events.trigger(instance, 'error', [
             {
                 type: type
-            }]);
+            }
+        ]);
     }
 
     function isValidDuration(duration) {
@@ -156,7 +157,6 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
     }
 
     function setCurrentTimeIfNeeded(element, seconds) {
-
         if (Math.abs(element.currentTime || 0, seconds) <= 1) {
             element.currentTime = seconds;
         }
@@ -354,9 +354,7 @@ define(['appSettings', 'browser', 'events'], function (appSettings, browser, eve
                             } else {
                                 onErrorInternal(instance, 'network');
                             }
-                        }
-
-                        else {
+                        } else {
                             console.log("fatal network error encountered, try to recover");
                             hls.startLoad();
                         }
diff --git a/src/components/htmlaudioplayer/plugin.js b/src/components/htmlaudioplayer/plugin.js
index daf22790a6..1b41cc544d 100644
--- a/src/components/htmlaudioplayer/plugin.js
+++ b/src/components/htmlaudioplayer/plugin.js
@@ -52,7 +52,7 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
     function supportsFade() {
 
         if (browser.tv) {
-            // Not working on tizen. 
+            // Not working on tizen.
             // We could possibly enable on other tv's, but all smart tv browsers tend to be pretty primitive
             return false;
         }
@@ -168,7 +168,6 @@ define(['events', 'browser', 'require', 'apphost', 'appSettings', 'htmlMediaHelp
                     });
                 });
 
-
             }, function () {
 
                 elem.autoplay = true;
diff --git a/src/components/htmlvideoplayer/plugin.js b/src/components/htmlvideoplayer/plugin.js
index ee7087c3cc..080cdb3e27 100644
--- a/src/components/htmlvideoplayer/plugin.js
+++ b/src/components/htmlvideoplayer/plugin.js
@@ -298,10 +298,10 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
                         type: 'flv',
                         url: url
                     },
-                        {
-                            seekType: 'range',
-                            lazyLoad: false
-                        });
+                    {
+                        seekType: 'range',
+                        lazyLoad: false
+                    });
 
                     flvPlayer.attachMediaElement(elem);
                     flvPlayer.load();
@@ -420,7 +420,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
         function onMediaManagerLoadMedia(event) {
 
             if (self._castPlayer) {
-                self._castPlayer.unload();    // Must unload before starting again.
+                self._castPlayer.unload(); // Must unload before starting again.
             }
             self._castPlayer = null;
 
@@ -532,12 +532,8 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
             } else*/ if (browser.chromecast && val.indexOf('.m3u8') !== -1 && options.mediaSource.RunTimeTicks) {
 
                 return setCurrentSrcChromecast(self, elem, options, val);
-            }
-
-            else if (htmlMediaHelper.enableHlsJsPlayer(options.mediaSource.RunTimeTicks, 'Video') && val.indexOf('.m3u8') !== -1) {
-                
+            } else if (htmlMediaHelper.enableHlsJsPlayer(options.mediaSource.RunTimeTicks, 'Video') && val.indexOf('.m3u8') !== -1) {
                 return setSrcWithHlsJs(self, elem, options, val);
-
             } else if (options.playMethod !== 'Transcode' && options.mediaSource.Container === 'flv') {
 
                 return setSrcWithFlvJs(self, elem, options, val);
@@ -577,7 +573,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
             var offsetValue = parseFloat(offset);
 
             // if .ass currently rendering
-            if (currentAssRenderer){
+            if (currentAssRenderer) {
                 updateCurrentTrackOffset(offsetValue);
             } else {
                 var videoElement = self._mediaElement;
@@ -586,22 +582,22 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
                 Array.from(videoElement.textTracks)
                     .filter(function(trackElement) {
                     // get showing .vtt textTacks
-                    return trackElement.mode === 'showing';
-                })
-                .forEach(function(trackElement) {
+                        return trackElement.mode === 'showing';
+                    })
+                    .forEach(function(trackElement) {
 
-                    var track = customTrackIndex === -1 ? null : mediaStreamTextTracks.filter(function (t) {
-                        return t.Index === customTrackIndex;
-                    })[0];
+                        var track = customTrackIndex === -1 ? null : mediaStreamTextTracks.filter(function (t) {
+                            return t.Index === customTrackIndex;
+                        })[0];
 
-                    if (track) {
-                        offsetValue = updateCurrentTrackOffset(offsetValue);
-                        setVttSubtitleOffset(trackElement, offsetValue);
-                    } else {
-                        console.log("No available track, cannot apply offset : " + offsetValue);
-                    }
+                        if (track) {
+                            offsetValue = updateCurrentTrackOffset(offsetValue);
+                            setVttSubtitleOffset(trackElement, offsetValue);
+                        } else {
+                            console.log("No available track, cannot apply offset : " + offsetValue);
+                        }
 
-                });
+                    });
             }
         };
 
@@ -609,7 +605,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
 
             var relativeOffset = offsetValue;
             var newTrackOffset = offsetValue;
-            if(currentTrackOffset){
+            if (currentTrackOffset) {
                 relativeOffset -= currentTrackOffset;
             }
             currentTrackOffset = newTrackOffset;
@@ -619,12 +615,12 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
 
         function setVttSubtitleOffset(currentTrack, offsetValue) {
 
-            if(currentTrack.cues) {
+            if (currentTrack.cues) {
                 Array.from(currentTrack.cues)
-                .forEach(function(cue) {
-                    cue.startTime -= offsetValue;
-                    cue.endTime -= offsetValue;
-                });
+                    .forEach(function(cue) {
+                        cue.startTime -= offsetValue;
+                        cue.endTime -= offsetValue;
+                    });
             }
 
         }
@@ -650,7 +646,6 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
 
             return profiles.filter(function (p) {
 
-
                 if (p.Type === 'Video') {
 
                     if (!p.AudioCodec) {
@@ -683,7 +678,9 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
             }
 
             var audioIndex = -1;
-            var i, length, stream;
+            var i;
+            var length;
+            var stream;
 
             for (i = 0, length = streams.length; i < length; i++) {
                 stream = streams[i];
@@ -1029,8 +1026,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
             if (browser.ps4) {
                 // Text outlines are not rendering very well
                 rendererSettings.enableSvg = false;
-            }
-            else if (browser.edge || browser.msie) {
+            } else if (browser.edge || browser.msie) {
                 // svg not rendering at all
                 rendererSettings.enableSvg = false;
             }
@@ -1232,7 +1228,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
         function updateSubtitleText(timeMs) {
 
             // handle offset for ass tracks
-            if(currentTrackOffset) {
+            if (currentTrackOffset) {
                 timeMs += (currentTrackOffset * 1000);
             }
 
@@ -1481,6 +1477,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
         }
 
         list.push('SetBrightness');
+        list.push("SetAspectRatio")
 
         return list;
     }
@@ -1561,8 +1558,7 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
             this.isPip = isEnabled;
             if (isEnabled) {
                 Windows.UI.ViewManagement.ApplicationView.getForCurrentView().tryEnterViewModeAsync(Windows.UI.ViewManagement.ApplicationViewMode.compactOverlay);
-            }
-            else {
+            } else {
                 Windows.UI.ViewManagement.ApplicationView.getForCurrentView().tryEnterViewModeAsync(Windows.UI.ViewManagement.ApplicationViewMode.default);
             }
         } else {
@@ -1709,7 +1705,15 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
     };
 
     HtmlVideoPlayer.prototype.setAspectRatio = function (val) {
-
+        var mediaElement = this._mediaElement;
+        if (mediaElement) {
+            if ("auto" === val) {
+                mediaElement.style.removeProperty("object-fit")
+            } else {
+                mediaElement.style["object-fit"] = val
+            }
+        }
+        this._currentAspectRatio = val
     };
 
     HtmlVideoPlayer.prototype.getAspectRatio = function () {
@@ -1717,7 +1721,16 @@ define(['browser', 'require', 'events', 'apphost', 'loading', 'dom', 'playbackMa
     };
 
     HtmlVideoPlayer.prototype.getSupportedAspectRatios = function () {
-        return [];
+        return [{
+            name: "Auto",
+            id: "auto"
+        }, {
+            name: "Cover",
+            id: "cover"
+        }, {
+            name: "Fill",
+            id: "fill"
+        }]
     };
 
     HtmlVideoPlayer.prototype.togglePictureInPicture = function () {
diff --git a/src/components/imagedownloader/imagedownloader.js b/src/components/imagedownloader/imagedownloader.js
index 182b72071f..7bd5159a17 100644
--- a/src/components/imagedownloader/imagedownloader.js
+++ b/src/components/imagedownloader/imagedownloader.js
@@ -116,7 +116,7 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
         if (showControls) {
             html += '<div data-role="controlgroup" data-type="horizontal" style="display:inline-block;">';
 
-            html += '<button is="paper-icon-button-light" title="' + globalize.translate('Previous') + '" class="btnPreviousPage autoSize" ' + (startIndex ? '' : 'disabled') + '><i class="md-icon">&#xE5C4;</i></button>';
+            html += '<button is="paper-icon-button-light" title="' + globalize.translate('Previous') + '" class="btnPreviousPage autoSize" ' + (startIndex ? '' : 'disabled') + '><i class="md-icon">arrow_back</i></button>';
             html += '<button is="paper-icon-button-light" title="' + globalize.translate('Next') + '" class="btnNextPage autoSize" ' + (startIndex + limit >= totalRecordCount ? 'disabled' : '') + '><i class="md-icon">arrow_forward</i></button>';
             html += '</div>';
         }
@@ -176,22 +176,17 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
         var shape = 'backdrop';
         if (imageType === "Backdrop" || imageType === "Art" || imageType === "Thumb" || imageType === "Logo") {
             shape = 'backdrop';
-        }
-        else if (imageType === "Banner") {
+        } else if (imageType === "Banner") {
             shape = 'banner';
-        }
-        else if (imageType === "Disc") {
+        } else if (imageType === "Disc") {
             shape = 'square';
-        }
-        else {
+        } else {
 
             if (currentItemType === "Episode") {
                 shape = 'backdrop';
-            }
-            else if (currentItemType === "MusicAlbum" || currentItemType === "MusicArtist") {
+            } else if (currentItemType === "MusicAlbum" || currentItemType === "MusicArtist") {
                 shape = 'square';
-            }
-            else {
+            } else {
                 shape = 'portrait';
             }
         }
@@ -224,8 +219,7 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
 
         if (layoutManager.tv || !appHost.supports('externallinks')) {
             html += '<div class="cardImageContainer lazy" data-src="' + getDisplayUrl(image.Url, apiClient) + '" style="background-position:center bottom;"></div>';
-        }
-        else {
+        } else {
             html += '<a is="emby-linkbutton" target="_blank" href="' + getDisplayUrl(image.Url, apiClient) + '" class="button-link cardImageContainer lazy" data-src="' + getDisplayUrl(image.Url, apiClient) + '" style="background-position:center bottom;"></a>';
         }
 
@@ -283,7 +277,7 @@ define(['loading', 'apphost', 'dialogHelper', 'connectionManager', 'imageLoader'
         if (enableFooterButtons) {
             html += '<div class="cardText cardTextCentered">';
 
-            html += '<button is="paper-icon-button-light" class="btnDownloadRemoteImage autoSize" raised" title="' + globalize.translate('Download') + '"><i class="md-icon">&#xE2C0;</i></button>';
+            html += '<button is="paper-icon-button-light" class="btnDownloadRemoteImage autoSize" raised" title="' + globalize.translate('Download') + '"><i class="md-icon">cloud_download</i></button>';
             html += '</div>';
         }
 
diff --git a/src/components/imagedownloader/imagedownloader.template.html b/src/components/imagedownloader/imagedownloader.template.html
index 2adc573de6..c192fad299 100644
--- a/src/components/imagedownloader/imagedownloader.template.html
+++ b/src/components/imagedownloader/imagedownloader.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
     <h3 class="formDialogHeaderTitle">
         ${Search}
     </h3>
diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js
index 2c649bdd16..fade0dd04c 100644
--- a/src/components/imageeditor/imageeditor.js
+++ b/src/components/imageeditor/imageeditor.js
@@ -24,8 +24,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
         if (item) {
             apiClient = connectionManager.getApiClient(item.ServerId);
             reloadItem(page, item, apiClient, focusContext);
-        }
-        else {
+        } else {
 
             apiClient = connectionManager.getApiClient(currentItem.ServerId);
             apiClient.getItem(apiClient.getCurrentUserId(), currentItem.Id).then(function (item) {
@@ -60,7 +59,6 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
                 }
             }
 
-
             apiClient.getItemImageInfos(currentItem.Id).then(function (imageInfos) {
 
                 renderStandardImages(page, apiClient, item, imageInfos, providers);
@@ -167,8 +165,7 @@ define(['dialogHelper', 'connectionManager', 'loading', 'dom', 'layoutManager',
                 } else {
                     html += '<button type="button" is="paper-icon-button-light" class="autoSize" disabled title="' + globalize.translate('MoveRight') + '"><i class="md-icon">chevron_right</i></button>';
                 }
-            }
-            else {
+            } else {
                 if (imageProviders.length) {
                     html += '<button type="button" is="paper-icon-button-light" data-imagetype="' + image.ImageType + '" class="btnSearchImages autoSize" title="' + globalize.translate('Search') + '"><i class="md-icon">search</i></button>';
                 }
diff --git a/src/components/imageeditor/imageeditor.template.html b/src/components/imageeditor/imageeditor.template.html
index e25dc8789b..3524f449de 100644
--- a/src/components/imageeditor/imageeditor.template.html
+++ b/src/components/imageeditor/imageeditor.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
     <h3 class="formDialogHeaderTitle">
         ${HeaderEditImages}
     </h3>
@@ -12,10 +12,10 @@
             <div class="imageEditor-buttons first-imageEditor-buttons">
                 <h2 style="margin:0;">${Images}</h2>
                 <button type="button" is="emby-button" class="btnBrowseAllImages fab mini autoSize" style="margin-left: 1em;">
-                    <i class="md-icon">&#xE8B6;</i>
+                    <i class="md-icon">search</i>
                 </button>
                 <button type="button" is="emby-button" class="btnOpenUploadMenu fab mini hide" style="margin-left: .5em;">
-                    <i class="md-icon">&#xE145;</i>
+                    <i class="md-icon">add</i>
                 </button>
             </div>
             <div id="images" class="itemsContainer vertical-wrap">
@@ -27,10 +27,10 @@
             <div class="imageEditor-buttons">
                 <h2 style="margin:0;">${Backdrops}</h2>
                 <button type="button" is="emby-button" class="btnBrowseAllImages fab mini autoSize" style="margin-left: 1em;" data-imagetype="Backdrop">
-                    <i class="md-icon">&#xE8B6;</i>
+                    <i class="md-icon">search</i>
                 </button>
                 <button type="button" is="emby-button" class="btnOpenUploadMenu fab mini hide" style="margin-left: .5em;" data-imagetype="Backdrop">
-                    <i class="md-icon">&#xE145;</i>
+                    <i class="md-icon">add</i>
                 </button>
             </div>
             <div id="backdrops" class="itemsContainer vertical-wrap">
@@ -42,10 +42,10 @@
             <div class="imageEditor-buttons">
                 <h2 style="margin: 0;">${Screenshots}</h2>
                 <button type="button" is="emby-button" class="btnBrowseAllImages fab mini autoSize" style="margin-left: 1em;" data-imagetype="Screenshot">
-                    <i class="md-icon">&#xE8B6;</i>
+                    <i class="md-icon">search</i>
                 </button>
                 <button type="button" is="emby-button" class="btnOpenUploadMenu fab mini hide" style="margin-left: .5em;" data-imagetype="Screenshot">
-                    <i class="md-icon">&#xE145;</i>
+                    <i class="md-icon">add</i>
                 </button>
             </div>
             <div id="screenshots" class="itemsContainer vertical-wrap">
diff --git a/src/components/imageoptionseditor/imageoptionseditor.template.html b/src/components/imageoptionseditor/imageoptionseditor.template.html
index a247c773e7..9bb1f8426b 100644
--- a/src/components/imageoptionseditor/imageoptionseditor.template.html
+++ b/src/components/imageoptionseditor/imageoptionseditor.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
+    <button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
     <h3 class="formDialogHeaderTitle">
         ${HeaderImageOptions}
     </h3>
@@ -75,4 +75,4 @@
 
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/components/images/imageLoader.js b/src/components/images/imageLoader.js
index 2a77daa216..a2906cca85 100644
--- a/src/components/images/imageLoader.js
+++ b/src/components/images/imageLoader.js
@@ -70,7 +70,9 @@ define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings',
         }
 
         // Use the median
-        values.sort(function (a, b) { return a - b; });
+        values.sort(function (a, b) {
+            return a - b;
+        });
 
         var half = Math.floor(values.length / 2);
 
@@ -78,8 +80,7 @@ define(['lazyLoader', 'imageFetcher', 'layoutManager', 'browser', 'appSettings',
 
         if (values.length % 2) {
             result = values[half];
-        }
-        else {
+        } else {
             result = (values[half - 1] + values[half]) / 2.0;
         }
 
diff --git a/src/components/imageuploader/imageuploader.js b/src/components/imageuploader/imageuploader.js
index 3a52d7110d..98fcf0ebce 100644
--- a/src/components/imageuploader/imageuploader.js
+++ b/src/components/imageuploader/imageuploader.js
@@ -150,7 +150,7 @@ define(['dialogHelper', 'connectionManager', 'dom', 'loading', 'scrollHelper', '
                 scrollHelper.centerFocus.on(dlg, false);
             }
 
-            // Has to be assigned a z-index after the call to .open() 
+            // Has to be assigned a z-index after the call to .open()
             dlg.addEventListener('close', function () {
 
                 if (layoutManager.tv) {
diff --git a/src/components/imageuploader/imageuploader.template.html b/src/components/imageuploader/imageuploader.template.html
index 90d9cf0def..b33355945a 100644
--- a/src/components/imageuploader/imageuploader.template.html
+++ b/src/components/imageuploader/imageuploader.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
     <h3 class="formDialogHeaderTitle">
         ${HeaderUploadImage}
     </h3>
@@ -14,7 +14,7 @@
                 <h2 style="margin:0;">${HeaderAddUpdateImage}</h2>
 
                 <button is="emby-button" type="button" class="raised raised-mini btnBrowse" style="margin-left:1.5em;">
-                    <i class="md-icon">&#xE2C7;</i>
+                    <i class="md-icon">folder</i>
                     <span>${Browse}</span>
                 </button>
             </div>
diff --git a/src/components/indicators/indicators.js b/src/components/indicators/indicators.js
index 2e8d28523e..8deedef6c8 100644
--- a/src/components/indicators/indicators.js
+++ b/src/components/indicators/indicators.js
@@ -90,7 +90,7 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
             }
 
             if (userData.PlayedPercentage && userData.PlayedPercentage >= 100 || (userData.Played)) {
-                return '<div class="playedIndicator indicator"><i class="md-icon indicatorIcon">&#xE5CA;</i></div>';
+                return '<div class="playedIndicator indicator"><i class="md-icon indicatorIcon">check</i></div>';
             }
         }
 
@@ -119,7 +119,7 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
         var status;
 
         if (item.Type === 'SeriesTimer') {
-            return '<i class="md-icon timerIndicator indicatorIcon">&#xE062;</i>';
+            return '<i class="md-icon timerIndicator indicatorIcon">fiber_smart_record</i>';
         } else if (item.TimerId || item.SeriesTimerId) {
             status = item.Status || 'Cancelled';
         } else if (item.Type === 'Timer') {
@@ -130,20 +130,20 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
 
         if (item.SeriesTimerId) {
             if (status !== 'Cancelled') {
-                return '<i class="md-icon timerIndicator indicatorIcon">&#xE062;</i>';
+                return '<i class="md-icon timerIndicator indicatorIcon">fiber_smart_record</i>';
             }
 
-            return '<i class="md-icon timerIndicator timerIndicator-inactive indicatorIcon">&#xE062;</i>';
+            return '<i class="md-icon timerIndicator timerIndicator-inactive indicatorIcon">fiber_smart_record</i>';
         }
 
-        return '<i class="md-icon timerIndicator indicatorIcon">&#xE061;</i>';
+        return '<i class="md-icon timerIndicator indicatorIcon">fiber_manual_record</i>';
     }
 
     function getSyncIndicator(item) {
         if (item.SyncPercent === 100) {
-            return '<div class="syncIndicator indicator fullSyncIndicator"><i class="md-icon indicatorIcon">&#xE2C4;</i></div>';
+            return '<div class="syncIndicator indicator fullSyncIndicator"><i class="md-icon indicatorIcon">file_download</i></div>';
         } else if (item.SyncPercent != null) {
-            return '<div class="syncIndicator indicator emptySyncIndicator"><i class="md-icon indicatorIcon">&#xE2C4;</i></div>';
+            return '<div class="syncIndicator indicator emptySyncIndicator"><i class="md-icon indicatorIcon">file_download</i></div>';
         }
 
         return '';
@@ -151,13 +151,13 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
 
     function getTypeIndicator(item) {
         if (item.Type === 'Video') {
-            return '<div class="indicator videoIndicator"><i class="md-icon indicatorIcon">&#xE04B;</i></div>';
+            return '<div class="indicator videoIndicator"><i class="md-icon indicatorIcon">videocam</i></div>';
         }
         if (item.Type === 'Folder' || item.Type === 'PhotoAlbum') {
-            return '<div class="indicator videoIndicator"><i class="md-icon indicatorIcon">&#xE2C7;</i></div>';
+            return '<div class="indicator videoIndicator"><i class="md-icon indicatorIcon">folder</i></div>';
         }
         if (item.Type === 'Photo') {
-            return '<div class="indicator videoIndicator"><i class="md-icon indicatorIcon">&#xE410;</i></div>';
+            return '<div class="indicator videoIndicator"><i class="md-icon indicatorIcon">photo</i></div>';
         }
 
         return '';
@@ -232,4 +232,4 @@ define(['datetime', 'itemHelper', 'css!./indicators.css', 'material-icons'], fun
         getTypeIndicator: getTypeIndicator,
         getMissingIndicator: getMissingIndicator
     };
-});
\ No newline at end of file
+});
diff --git a/src/components/itemMediaInfo/itemMediaInfo.template.html b/src/components/itemMediaInfo/itemMediaInfo.template.html
index 7e011b4cf4..a947a55d2e 100644
--- a/src/components/itemMediaInfo/itemMediaInfo.template.html
+++ b/src/components/itemMediaInfo/itemMediaInfo.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
     <h3 class="formDialogHeaderTitle">
         ${HeaderMediaInfo}
     </h3>
diff --git a/src/components/itemcontextmenu.js b/src/components/itemcontextmenu.js
index 46a65cabc3..a3aa8cac4f 100644
--- a/src/components/itemcontextmenu.js
+++ b/src/components/itemcontextmenu.js
@@ -52,8 +52,6 @@ define(["apphost", "globalize", "connectionManager", "itemHelper", "appRouter",
             //}
         }
 
-
-
         if (item.IsFolder || item.Type === "MusicArtist" || item.Type === "MusicGenre") {
             if (item.CollectionType !== "livetv") {
                 if (options.shuffle !== false) {
diff --git a/src/components/itemhelper.js b/src/components/itemhelper.js
index f8bdb28ac5..8e0883474a 100644
--- a/src/components/itemhelper.js
+++ b/src/components/itemhelper.js
@@ -250,9 +250,7 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
                 if (item.Type !== 'TvChannel') {
                     return true;
                 }
-            }
-
-            else if (item.MediaType === 'Audio') {
+            } else if (item.MediaType === 'Audio') {
                 if (item.Type === 'AudioPodcast') {
                     return true;
                 }
@@ -274,7 +272,13 @@ define(['apphost', 'globalize'], function (appHost, globalize) {
 
         canRate: function (item) {
 
-            if (item.Type === 'Program' || item.Type === 'Timer' || item.Type === 'SeriesTimer' || item.Type === 'CollectionFolder' || item.Type === 'UserView' || item.Type === 'Channel') {
+            if (item.Type === 'Program'
+                || item.Type === 'Timer'
+                || item.Type === 'SeriesTimer'
+                || item.Type === 'CollectionFolder'
+                || item.Type === 'UserView'
+                || item.Type === 'Channel'
+                || !item.UserData) {
                 return false;
             }
 
diff --git a/src/components/itemidentifier/itemidentifier.js b/src/components/itemidentifier/itemidentifier.js
index fa01a4aced..6f28de0b3b 100644
--- a/src/components/itemidentifier/itemidentifier.js
+++ b/src/components/itemidentifier/itemidentifier.js
@@ -21,7 +21,8 @@ define(["dialogHelper", "loading", "connectionManager", "require", "globalize",
             ProviderIds: {}
         };
 
-        var i, length;
+        var i;
+        var length;
         var identifyField = page.querySelectorAll(".identifyField");
         var value;
         for (i = 0, length = identifyField.length; i < length; i++) {
@@ -64,8 +65,7 @@ define(["dialogHelper", "loading", "connectionManager", "require", "globalize",
 
         if (currentItem && currentItem.Id) {
             lookupInfo.ItemId = currentItem.Id;
-        }
-        else {
+        } else {
             lookupInfo.IncludeDisabledProviders = true;
         }
 
@@ -97,7 +97,8 @@ define(["dialogHelper", "loading", "connectionManager", "require", "globalize",
         page.querySelector(".dialogContentInner").classList.remove("dialog-content-centered");
 
         var html = "";
-        var i, length;
+        var i;
+        var length;
         for (i = 0, length = results.length; i < length; i++) {
 
             var result = results[i];
@@ -184,12 +185,10 @@ define(["dialogHelper", "loading", "connectionManager", "require", "globalize",
         if (currentItemType === "Episode") {
             cssClass += " backdropCard backdropCard-scalable";
             padderClass = "cardPadder-backdrop";
-        }
-        else if (currentItemType === "MusicAlbum" || currentItemType === "MusicArtist") {
+        } else if (currentItemType === "MusicAlbum" || currentItemType === "MusicArtist") {
             cssClass += " squareCard squareCard-scalable";
             padderClass = "cardPadder-square";
-        }
-        else {
+        } else {
             cssClass += " portraitCard portraitCard-scalable";
             padderClass = "cardPadder-portrait";
         }
@@ -452,8 +451,6 @@ define(["dialogHelper", "loading", "connectionManager", "require", "globalize",
                 scrollHelper.centerFocus.on(dlg.querySelector(".formDialogContent"), false);
             }
 
-
-
             dialogHelper.open(dlg);
 
             dlg.querySelector(".btnCancel").addEventListener("click", function (e) {
diff --git a/src/components/itemidentifier/itemidentifier.template.html b/src/components/itemidentifier/itemidentifier.template.html
index 9750bab57d..0081b543a4 100644
--- a/src/components/itemidentifier/itemidentifier.template.html
+++ b/src/components/itemidentifier/itemidentifier.template.html
@@ -1,6 +1,6 @@
 <div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
-        <i class="md-icon">&#xE5C4;</i>
+        <i class="md-icon">arrow_back</i>
     </button>
     <h3 class="formDialogHeaderTitle">
         ${Identify}
diff --git a/src/components/itemsrefresher.js b/src/components/itemsrefresher.js
index d9bef95b4b..46956d2df5 100644
--- a/src/components/itemsrefresher.js
+++ b/src/components/itemsrefresher.js
@@ -11,8 +11,7 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
         if (eventsToMonitor.indexOf('markfavorite') !== -1) {
 
             instance.notifyRefreshNeeded();
-        }
-        else if (eventsToMonitor.indexOf('markplayed') !== -1) {
+        } else if (eventsToMonitor.indexOf('markplayed') !== -1) {
 
             instance.notifyRefreshNeeded();
         }
@@ -115,9 +114,7 @@ define(['playbackManager', 'serverNotifications', 'events'], function (playbackM
                 instance.notifyRefreshNeeded(true);
                 return;
             }
-        }
-
-        else if (state.NowPlayingItem && state.NowPlayingItem.MediaType === 'Audio') {
+        } else if (state.NowPlayingItem && state.NowPlayingItem.MediaType === 'Audio') {
 
             if (eventsToMonitor.indexOf('audioplayback') !== -1) {
 
diff --git a/src/components/keyboardnavigation.js b/src/components/keyboardnavigation.js
index 7ed74f2201..8c0bb1a3ae 100644
--- a/src/components/keyboardnavigation.js
+++ b/src/components/keyboardnavigation.js
@@ -8,20 +8,20 @@ define(['inputManager', 'focusManager'], function(inputManager, focusManager) {
             var capture = true;
 
             switch (e.keyCode) {
-            case 37: // ArrowLeft
-                inputManager.handle('left');
-                break;
-            case 38: // ArrowUp
-                inputManager.handle('up');
-                break;
-            case 39: // ArrowRight
-                inputManager.handle('right');
-                break;
-            case 40: // ArrowDown
-                inputManager.handle('down');
-                break;
-            default:
-                capture = false;
+                case 37: // ArrowLeft
+                    inputManager.handle('left');
+                    break;
+                case 38: // ArrowUp
+                    inputManager.handle('up');
+                    break;
+                case 39: // ArrowRight
+                    inputManager.handle('right');
+                    break;
+                case 40: // ArrowDown
+                    inputManager.handle('down');
+                    break;
+                default:
+                    capture = false;
             }
             if (capture) {
                 console.log("Disabling default event handling");
@@ -31,6 +31,6 @@ define(['inputManager', 'focusManager'], function(inputManager, focusManager) {
 
     }
     return {
-        enable: enable,
+        enable: enable
     };
 });
diff --git a/src/components/lazyloader/lazyloader-intersectionobserver.js b/src/components/lazyloader/lazyloader-intersectionobserver.js
index 261ca84261..1935f65a30 100644
--- a/src/components/lazyloader/lazyloader-intersectionobserver.js
+++ b/src/components/lazyloader/lazyloader-intersectionobserver.js
@@ -45,7 +45,7 @@ define(['require', 'browser'], function (require, browser) {
                 }
             }
         },
-            observerOptions
+        observerOptions
         );
 
         this.observer = observer;
diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js
index 257551abf6..94535deb6f 100644
--- a/src/components/listview/listview.js
+++ b/src/components/listview/listview.js
@@ -9,7 +9,8 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
         }
 
         var sortBy = (options.sortBy || '').toLowerCase();
-        var code, name;
+        var code;
+        var name;
 
         if (sortBy.indexOf('sortname') === 0) {
 
@@ -85,15 +86,12 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
 
             options.tag = item.AlbumPrimaryImageTag;
             return apiClient.getScaledImageUrl(item.AlbumId, options);
-        }
-
-        else if (item.SeriesId && item.SeriesPrimaryImageTag) {
+        } else if (item.SeriesId && item.SeriesPrimaryImageTag) {
 
             options.tag = item.SeriesPrimaryImageTag;
             return apiClient.getScaledImageUrl(item.SeriesId, options);
 
-        }
-        else if (item.ParentPrimaryImageTag) {
+        } else if (item.ParentPrimaryImageTag) {
 
             options.tag = item.ParentPrimaryImageTag;
             return apiClient.getScaledImageUrl(item.ParentPrimaryImageItemId, options);
@@ -209,8 +207,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
 
                     if (i === 0) {
                         html += '<h2 class="listGroupHeader listGroupHeader-first">';
-                    }
-                    else {
+                    } else {
                         html += '<h2 class="listGroupHeader">';
                     }
                     html += itemGroupTitle;
@@ -265,9 +262,9 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
             }
 
             if (!clickEntireItem && options.dragHandle) {
-                //html += '<button is="paper-icon-button-light" class="listViewDragHandle listItemButton"><i class="md-icon">&#xE25D;</i></button>';
+                //html += '<button is="paper-icon-button-light" class="listViewDragHandle listItemButton"><i class="md-icon">drag_handle</i></button>';
                 // Firefox and Edge are not allowing the button to be draggable
-                html += '<i class="listViewDragHandle md-icon listItemIcon listItemIcon-transparent">&#xE25D;</i>';
+                html += '<i class="listViewDragHandle md-icon listItemIcon listItemIcon-transparent">drag_handle</i>';
             }
 
             if (options.image !== false) {
@@ -301,7 +298,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
                 }
 
                 if (playOnImageClick) {
-                    html += '<button is="paper-icon-button-light" class="listItemImageButton itemAction" data-action="resume"><i class="md-icon listItemImageButton-icon">&#xE037;</i></button>';
+                    html += '<button is="paper-icon-button-light" class="listItemImageButton itemAction" data-action="resume"><i class="md-icon listItemImageButton-icon">play_arrow</i></button>';
                 }
 
                 var progressHtml = indicators.getProgressBarHtml(item, {
@@ -349,9 +346,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
             if (options.showParentTitle) {
                 if (item.Type === 'Episode') {
                     parentTitle = item.SeriesName;
-                }
-
-                else if (item.IsSeries || (item.EpisodeTitle && item.Name)) {
+                } else if (item.IsSeries || (item.EpisodeTitle && item.Name)) {
                     parentTitle = item.Name;
                 }
             }
@@ -375,8 +370,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
                 }
 
                 textlines.push(parentTitle || '');
-            }
-            else if (options.showParentTitle) {
+            } else if (options.showParentTitle) {
                 textlines.push(parentTitle || '');
             }
 
@@ -400,8 +394,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
 
                     if (!artistItems || !artistItems.length) {
                         showArtist = true;
-                    }
-                    else if (artistItems.length > 1 || containerAlbumArtistIds.indexOf(artistItems[0].Id) === -1) {
+                    } else if (artistItems.length > 1 || containerAlbumArtistIds.indexOf(artistItems[0].Id) === -1) {
                         showArtist = true;
                     }
                 }
@@ -434,7 +427,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
 
             html += '<div class="' + cssClass + '">';
 
-            var moreIcon = '&#xE5D3;';
+            var moreIcon = 'more_horiz';
 
             html += getTextLinesHtml(textlines, isLargeStyle);
 
@@ -481,7 +474,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
             if (!clickEntireItem) {
 
                 if (options.addToListButton) {
-                    html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="addtoplaylist"><i class="md-icon">&#xE03B;</i></button>';
+                    html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="addtoplaylist"><i class="md-icon">playlist_add</i></button>';
                 }
 
                 if (options.moreButton !== false) {
@@ -489,7 +482,7 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
                 }
 
                 if (options.infoButton) {
-                    html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="link"><i class="md-icon">&#xE88F;</i></button>';
+                    html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="link"><i class="md-icon">info_outline</i></button>';
                 }
 
                 if (options.rightButtons) {
@@ -504,11 +497,11 @@ define(['itemHelper', 'mediaInfo', 'indicators', 'connectionManager', 'layoutMan
                     var likes = userData.Likes == null ? '' : userData.Likes;
 
                     if (itemHelper.canMarkPlayed(item)) {
-                        html += '<button is="emby-playstatebutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><i class="md-icon">&#xE5CA;</i></button>';
+                        html += '<button is="emby-playstatebutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-played="' + (userData.Played) + '"><i class="md-icon">check</i></button>';
                     }
 
                     if (itemHelper.canRate(item)) {
-                        html += '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><i class="md-icon">&#xE87D;</i></button>';
+                        html += '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><i class="md-icon">favorite</i></button>';
                     }
 
                     html += '</span>';
diff --git a/src/components/loading/loading.js b/src/components/loading/loading.js
index ad9aea950a..510f311217 100644
--- a/src/components/loading/loading.js
+++ b/src/components/loading/loading.js
@@ -45,7 +45,8 @@ define(['components/loading/loadingLegacy', 'browser', 'css!./loading'], functio
             layer3.classList.add('mdl-spinner__layer-3-active');
             layer4.classList.add('mdl-spinner__layer-4-active');
 
-            var i, length;
+            var i;
+            var length;
 
             for (i = 0, length = circleLefts.length; i < length; i++) {
                 circleLefts[i].classList.add('mdl-spinner__circleLeft-active');
@@ -67,7 +68,8 @@ define(['components/loading/loadingLegacy', 'browser', 'css!./loading'], functio
                 elem.classList.remove('mdl-spinner__layer-3-active');
                 elem.classList.remove('mdl-spinner__layer-4-active');
 
-                var i, length;
+                var i;
+                var length;
 
                 for (i = 0, length = circleLefts.length; i < length; i++) {
                     circleLefts[i].classList.remove('mdl-spinner__circleLeft-active');
diff --git a/src/components/mediainfo/mediainfo.js b/src/components/mediainfo/mediainfo.js
index 441adac3dd..04df34685d 100644
--- a/src/components/mediainfo/mediainfo.js
+++ b/src/components/mediainfo/mediainfo.js
@@ -6,37 +6,35 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
         var status;
 
         if (item.Type === 'SeriesTimer') {
-            return '<i class="md-icon mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon">&#xE062;</i>';
-        }
-        else if (item.TimerId || item.SeriesTimerId) {
+            return '<i class="md-icon mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon">fiber_smart_record</i>';
+        } else if (item.TimerId || item.SeriesTimerId) {
 
             status = item.Status || 'Cancelled';
-        }
-        else if (item.Type === 'Timer') {
+        } else if (item.Type === 'Timer') {
 
             status = item.Status;
-        }
-        else {
+        } else {
             return '';
         }
 
         if (item.SeriesTimerId) {
 
             if (status !== 'Cancelled') {
-                return '<i class="md-icon mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon">&#xE062;</i>';
+                return '<i class="md-icon mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon">fiber_smart_record</i>';
             }
 
-            return '<i class="md-icon mediaInfoItem mediaInfoIconItem">&#xE062;</i>';
+            return '<i class="md-icon mediaInfoItem mediaInfoIconItem">fiber_smart_record</i>';
         }
 
-        return '<i class="md-icon mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon">&#xE061;</i>';
+        return '<i class="md-icon mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon">fiber_manual_record</i>';
     }
 
     function getProgramInfoHtml(item, options) {
         var html = '';
 
         var miscInfo = [];
-        var text, date;
+        var text;
+        var date;
 
         if (item.StartDate && options.programTime !== false) {
 
@@ -58,8 +56,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
                 }
 
                 miscInfo.push(text);
-            }
-            catch (e) {
+            } catch (e) {
                 console.log("Error parsing date: " + item.StartDate);
             }
         }
@@ -107,7 +104,9 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
 
         var miscInfo = [];
         options = options || {};
-        var text, date, minutes;
+        var text;
+        var date;
+        var minutes;
         var count;
 
         var showFolderRuntime = item.Type === "MusicAlbum" || item.MediaType === 'MusicArtist' || item.MediaType === 'Playlist' || item.MediaType === 'MusicGenre';
@@ -124,9 +123,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
             if (item.RunTimeTicks) {
                 miscInfo.push(datetime.getDisplayRunningTime(item.RunTimeTicks));
             }
-        }
-
-        else if (item.Type === "PhotoAlbum" || item.Type === "BoxSet") {
+        } else if (item.Type === "PhotoAlbum" || item.Type === "BoxSet") {
 
             count = item.ChildCount;
 
@@ -145,8 +142,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
 
                     text = datetime.toLocaleDateString(date);
                     miscInfo.push(text);
-                }
-                catch (e) {
+                } catch (e) {
                     console.log("Error parsing date: " + item.PremiereDate);
                 }
             }
@@ -162,8 +158,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
 
             if (item.RecordAnyChannel) {
                 miscInfo.push(globalize.translate('AllChannels'));
-            }
-            else {
+            } else {
                 miscInfo.push(item.ChannelName || globalize.translate('OneChannel'));
             }
         }
@@ -180,8 +175,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
                     text = datetime.getDisplayTime(date);
                     miscInfo.push(text);
                 }
-            }
-            catch (e) {
+            } catch (e) {
                 console.log("Error parsing date: " + item.StartDate);
             }
         }
@@ -191,8 +185,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
             if (item.Status === "Continuing") {
                 miscInfo.push(globalize.translate('SeriesYearToPresent', item.ProductionYear));
 
-            }
-            else if (item.ProductionYear) {
+            } else if (item.ProductionYear) {
 
                 text = item.ProductionYear;
 
@@ -206,8 +199,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
                             text += "-" + datetime.parseISO8601Date(item.EndDate).getFullYear();
                         }
 
-                    }
-                    catch (e) {
+                    } catch (e) {
                         console.log("Error parsing date: " + item.EndDate);
                     }
                 }
@@ -223,18 +215,15 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
                     miscInfo.push({
                         html: '<div class="mediaInfoProgramAttribute mediaInfoItem liveTvProgram">' + globalize.translate('Live') + '</div>'
                     });
-                }
-                else if (item.IsPremiere) {
+                } else if (item.IsPremiere) {
                     miscInfo.push({
                         html: '<div class="mediaInfoProgramAttribute mediaInfoItem premiereTvProgram">' + globalize.translate('Premiere') + '</div>'
                     });
-                }
-                else if (item.IsSeries && !item.IsRepeat) {
+                } else if (item.IsSeries && !item.IsRepeat) {
                     miscInfo.push({
                         html: '<div class="mediaInfoProgramAttribute mediaInfoItem newTvProgram">' + globalize.translate('AttributeNew') + '</div>'
                     });
-                }
-                else if (item.IsSeries && item.IsRepeat) {
+                } else if (item.IsSeries && item.IsRepeat) {
                     miscInfo.push({
                         html: '<div class="mediaInfoProgramAttribute mediaInfoItem repeatTvProgram">' + globalize.translate('Repeat') + '</div>'
                     });
@@ -250,20 +239,15 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
                 if (text) {
                     miscInfo.push(text);
                 }
-            }
-
-            else if (item.IsMovie && item.ProductionYear && options.originalAirDate !== false) {
+            } else if (item.IsMovie && item.ProductionYear && options.originalAirDate !== false) {
                 miscInfo.push(item.ProductionYear);
-            }
-
-            else if (item.PremiereDate && options.originalAirDate !== false) {
+            } else if (item.PremiereDate && options.originalAirDate !== false) {
 
                 try {
                     date = datetime.parseISO8601Date(item.PremiereDate);
                     text = globalize.translate('OriginalAirDateValue', datetime.toLocaleDateString(date));
                     miscInfo.push(text);
-                }
-                catch (e) {
+                } catch (e) {
                     console.log("Error parsing date: " + item.PremiereDate);
                 }
             } else if (item.ProductionYear) {
@@ -277,14 +261,12 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
                 if (item.ProductionYear) {
 
                     miscInfo.push(item.ProductionYear);
-                }
-                else if (item.PremiereDate) {
+                } else if (item.PremiereDate) {
 
                     try {
                         text = datetime.parseISO8601Date(item.PremiereDate).getFullYear();
                         miscInfo.push(text);
-                    }
-                    catch (e) {
+                    } catch (e) {
                         console.log("Error parsing date: " + item.PremiereDate);
                     }
                 }
@@ -411,7 +393,7 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
         if (rating) {
             html += '<div class="starRatingContainer mediaInfoItem">';
 
-            html += '<i class="md-icon starIcon">&#xE838;</i>';
+            html += '<i class="md-icon starIcon">star</i>';
             html += rating;
             html += '</div>';
         }
@@ -665,4 +647,4 @@ define(['datetime', 'globalize', 'appRouter', 'itemHelper', 'indicators', 'mater
         getMediaInfoStats: getMediaInfoStats,
         getResolutionText: getResolutionText
     };
-});
\ No newline at end of file
+});
diff --git a/src/components/medialibrarycreator/medialibrarycreator.js b/src/components/medialibrarycreator/medialibrarycreator.js
index 54c13a4ebe..183e22551f 100644
--- a/src/components/medialibrarycreator/medialibrarycreator.js
+++ b/src/components/medialibrarycreator/medialibrarycreator.js
@@ -151,13 +151,13 @@ define(["loading", "dialogHelper", "dom", "jQuery", "components/libraryoptionsed
                 var xhr = new XMLHttpRequest;
                 xhr.open("GET", "components/medialibrarycreator/medialibrarycreator.template.html", true);
                 xhr.onload = function(e) {
-                    var template = this.response,
-                        dlg = dialogHelper.createDialog({
-                            size: "medium-tall",
-                            modal: false,
-                            removeOnClose: true,
-                            scrollY: false
-                        });
+                    var template = this.response;
+                    var dlg = dialogHelper.createDialog({
+                        size: "medium-tall",
+                        modal: false,
+                        removeOnClose: true,
+                        scrollY: false
+                    });
                     dlg.classList.add("ui-body-a");
                     dlg.classList.add("background-theme-a");
                     dlg.classList.add("dlg-librarycreator");
diff --git a/src/components/medialibrarycreator/medialibrarycreator.template.html b/src/components/medialibrarycreator/medialibrarycreator.template.html
index 76b37a8f52..c7073bc9f2 100644
--- a/src/components/medialibrarycreator/medialibrarycreator.template.html
+++ b/src/components/medialibrarycreator/medialibrarycreator.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
+    <button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
     <h3 class="formDialogHeaderTitle">${ButtonAddMediaLibrary}</h3>
 </div>
 
@@ -40,4 +40,4 @@
     <button is="emby-button" type="button" class="raised btnSubmit button-submit block formDialogFooterItem">
         <span>${ButtonOk}</span>
     </button>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/components/medialibraryeditor/medialibraryeditor.template.html b/src/components/medialibraryeditor/medialibraryeditor.template.html
index 40238bf06e..dd13df4ca5 100644
--- a/src/components/medialibraryeditor/medialibraryeditor.template.html
+++ b/src/components/medialibraryeditor/medialibraryeditor.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
+    <button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
     <h3 class="formDialogHeaderTitle"></h3>
 </div>
 
@@ -34,4 +34,4 @@
     <button is="emby-button" type="button" class="raised btnSubmit button-submit block formDialogFooterItem">
         <span>${ButtonOk}</span>
     </button>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/components/metadataeditor/metadataeditor.js b/src/components/metadataeditor/metadataeditor.js
index 552c716c1f..8843dc159c 100644
--- a/src/components/metadataeditor/metadataeditor.js
+++ b/src/components/metadataeditor/metadataeditor.js
@@ -144,7 +144,9 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
             AirTime: form.querySelector('#txtAirTime').value,
             Genres: getListValues(form.querySelector("#listGenres")),
             Tags: getListValues(form.querySelector("#listTags")),
-            Studios: getListValues(form.querySelector("#listStudios")).map(function (element) { return { Name: element }; }),
+            Studios: getListValues(form.querySelector("#listStudios")).map(function (element) {
+                return { Name: element };
+            }),
 
             PremiereDate: getDateValue(form, '#txtPremiereDate', 'PremiereDate'),
             DateCreated: getDateValue(form, '#txtDateAdded', 'DateCreated'),
@@ -202,7 +204,9 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
     }
 
     function getListValues(list) {
-        return Array.prototype.map.call(list.querySelectorAll('.textValue'), function (el) { return el.textContent; });
+        return Array.prototype.map.call(list.querySelectorAll('.textValue'), function (el) {
+            return el.textContent;
+        });
     }
 
     function addElementToList(source, sortCallback) {
@@ -439,7 +443,6 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
         var html = metadataInfo.ContentTypeOptions.map(function (i) {
 
-
             return '<option value="' + i.Value + '">' + i.Name + '</option>';
 
         }).join('');
@@ -744,7 +747,9 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
         populateListView(context.querySelector('#listGenres'), item.Genres);
         populatePeople(context, item.People || []);
 
-        populateListView(context.querySelector('#listStudios'), (item.Studios || []).map(function (element) { return element.Name || ''; }));
+        populateListView(context.querySelector('#listStudios'), (item.Studios || []).map(function (element) {
+            return element.Name || '';
+        }));
 
         populateListView(context.querySelector('#listTags'), item.Tags);
 
@@ -783,8 +788,7 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
         if (item.Type === 'Series') {
             context.querySelector('#selectDisplayOrder').value = item.DisplayOrder || '';
-        }
-        else {
+        } else {
             context.querySelector('#selectDisplayOrder').value = item.DisplayOrder || '';
         }
 
@@ -859,7 +863,9 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
         html += "<option value=''></option>";
 
         var ratings = [];
-        var i, length, rating;
+        var i;
+        var length;
+        var rating;
 
         var currentValueFound = false;
 
@@ -901,7 +907,9 @@ define(['itemHelper', 'dom', 'layoutManager', 'dialogHelper', 'datetime', 'loadi
 
         items = items || [];
         if (typeof (sortCallback) === 'undefined') {
-            items.sort(function (a, b) { return a.toLowerCase().localeCompare(b.toLowerCase()); });
+            items.sort(function (a, b) {
+                return a.toLowerCase().localeCompare(b.toLowerCase());
+            });
         } else {
             items = sortCallback(items);
         }
diff --git a/src/components/metadataeditor/metadataeditor.template.html b/src/components/metadataeditor/metadataeditor.template.html
index bb6e0bbcbd..d44136c6b6 100644
--- a/src/components/metadataeditor/metadataeditor.template.html
+++ b/src/components/metadataeditor/metadataeditor.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
     <h3 class="formDialogHeaderTitle">
         ${Edit}
     </h3>
@@ -184,7 +184,7 @@
                     ${Genres}
                 </h2>
                 <button is="emby-button" type="button" class="fab btnAddTextItem submit" style="margin-left:1em;" title="${Add}">
-                    <i class="md-icon">&#xE145;</i>
+                    <i class="md-icon">add</i>
                 </button>
                 <div class="paperList" id="listGenres"></div>
             </div>
@@ -193,7 +193,7 @@
                     ${People}
                 </h2>
                 <button is="emby-button" type="button" id="btnAddPerson" class="fab btnAddPerson" style="margin-left:1em;" title="${Add}">
-                    <i class="md-icon">&#xE145;</i>
+                    <i class="md-icon">add</i>
                 </button>
                 <div id="peopleList" class="paperList">
                 </div>
@@ -203,7 +203,7 @@
                     ${Studios}
                 </h2>
                 <button is="emby-button" type="button" class="fab btnAddTextItem submit" style="margin-left:1em;" title="${Add}">
-                    <i class="md-icon">&#xE145;</i>
+                    <i class="md-icon">add</i>
                 </button>
                 <div class="paperList" id="listStudios"></div>
             </div>
@@ -212,7 +212,7 @@
                     ${Tags}
                 </h2>
                 <button is="emby-button" type="button" class="fab btnAddTextItem submit" style="margin-left:1em;" title="${Add}">
-                    <i class="md-icon">&#xE145;</i>
+                    <i class="md-icon">add</i>
                 </button>
                 <div class="paperList" id="listTags"></div>
             </div>
diff --git a/src/components/metadataeditor/personeditor.template.html b/src/components/metadataeditor/personeditor.template.html
index 6a808db1f4..75b011aa73 100644
--- a/src/components/metadataeditor/personeditor.template.html
+++ b/src/components/metadataeditor/personeditor.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
     <h3 class="formDialogHeaderTitle">
         ${Edit}
     </h3>
@@ -35,4 +35,4 @@
         </div>
 
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/components/multiselect/multiselect.js b/src/components/multiselect/multiselect.js
index d706b76b99..6b2906cb0a 100644
--- a/src/components/multiselect/multiselect.js
+++ b/src/components/multiselect/multiselect.js
@@ -1,5 +1,5 @@
-define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'globalize', 'appRouter', 'dom', 'css!./multiselect'], function (browser, appStorage, appHost, loading, connectionManager, globalize, appRouter, dom) {
-    'use strict';
+define(["browser", "appStorage", "apphost", "loading", "connectionManager", "globalize", "appRouter", "dom", "css!./multiselect"], function (browser, appStorage, appHost, loading, connectionManager, globalize, appRouter, dom) {
+    "use strict";
 
     var selectedItems = [];
     var selectedElements = [];
@@ -15,12 +15,12 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
             selectedItems = [];
             selectedElements = [];
-            var elems = document.querySelectorAll('.itemSelectionPanel');
+            var elems = document.querySelectorAll(".itemSelectionPanel");
             for (var i = 0, length = elems.length; i < length; i++) {
 
                 var parent = elems[i].parentNode;
                 parent.removeChild(elems[i]);
-                parent.classList.remove('withMultiSelect');
+                parent.classList.remove("withMultiSelect");
             }
         }
     }
@@ -28,13 +28,13 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
     function onItemSelectionPanelClick(e, itemSelectionPanel) {
 
         // toggle the checkbox, if it wasn't clicked on
-        if (!dom.parentWithClass(e.target, 'chkItemSelect')) {
-            var chkItemSelect = itemSelectionPanel.querySelector('.chkItemSelect');
+        if (!dom.parentWithClass(e.target, "chkItemSelect")) {
+            var chkItemSelect = itemSelectionPanel.querySelector(".chkItemSelect");
 
             if (chkItemSelect) {
 
-                if (chkItemSelect.classList.contains('checkedInitial')) {
-                    chkItemSelect.classList.remove('checkedInitial');
+                if (chkItemSelect.classList.contains("checkedInitial")) {
+                    chkItemSelect.classList.remove("checkedInitial");
                 } else {
                     var newValue = !chkItemSelect.checked;
                     chkItemSelect.checked = newValue;
@@ -50,7 +50,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
     function updateItemSelection(chkItemSelect, selected) {
 
-        var id = dom.parentWithAttribute(chkItemSelect, 'data-id').getAttribute('data-id');
+        var id = dom.parentWithAttribute(chkItemSelect, "data-id").getAttribute("data-id");
 
         if (selected) {
 
@@ -73,7 +73,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
         }
 
         if (selectedItems.length) {
-            var itemSelectionCount = document.querySelector('.itemSelectionCount');
+            var itemSelectionCount = document.querySelector(".itemSelectionCount");
             if (itemSelectionCount) {
                 itemSelectionCount.innerHTML = selectedItems.length;
             }
@@ -88,27 +88,27 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
     function showSelection(item, isChecked) {
 
-        var itemSelectionPanel = item.querySelector('.itemSelectionPanel');
+        var itemSelectionPanel = item.querySelector(".itemSelectionPanel");
 
         if (!itemSelectionPanel) {
 
-            itemSelectionPanel = document.createElement('div');
-            itemSelectionPanel.classList.add('itemSelectionPanel');
+            itemSelectionPanel = document.createElement("div");
+            itemSelectionPanel.classList.add("itemSelectionPanel");
 
-            var parent = item.querySelector('.cardBox') || item.querySelector('.cardContent');
-            parent.classList.add('withMultiSelect');
+            var parent = item.querySelector(".cardBox") || item.querySelector(".cardContent");
+            parent.classList.add("withMultiSelect");
             parent.appendChild(itemSelectionPanel);
 
-            var cssClass = 'chkItemSelect';
+            var cssClass = "chkItemSelect";
             if (isChecked && !browser.firefox) {
                 // In firefox, the initial tap hold doesnt' get treated as a click
                 // In other browsers it does, so we need to make sure that initial click is ignored
-                cssClass += ' checkedInitial';
+                cssClass += " checkedInitial";
             }
-            var checkedAttribute = isChecked ? ' checked' : '';
+            var checkedAttribute = isChecked ? " checked" : "";
             itemSelectionPanel.innerHTML = '<label class="checkboxContainer"><input type="checkbox" is="emby-checkbox" data-outlineclass="multiSelectCheckboxOutline" class="' + cssClass + '"' + checkedAttribute + '/><span></span></label>';
-            var chkItemSelect = itemSelectionPanel.querySelector('.chkItemSelect');
-            chkItemSelect.addEventListener('change', onSelectionChange);
+            var chkItemSelect = itemSelectionPanel.querySelector(".chkItemSelect");
+            chkItemSelect.addEventListener("change", onSelectionChange);
         }
     }
 
@@ -118,27 +118,27 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
         if (!selectionCommandsPanel) {
 
-            selectionCommandsPanel = document.createElement('div');
-            selectionCommandsPanel.classList.add('selectionCommandsPanel');
+            selectionCommandsPanel = document.createElement("div");
+            selectionCommandsPanel.classList.add("selectionCommandsPanel");
 
             document.body.appendChild(selectionCommandsPanel);
             currentSelectionCommandsPanel = selectionCommandsPanel;
 
-            var html = '';
+            var html = "";
 
             html += '<button is="paper-icon-button-light" class="btnCloseSelectionPanel autoSize"><i class="md-icon">close</i></button>';
             html += '<h1 class="itemSelectionCount"></h1>';
 
-            var moreIcon = '&#xE5D3;';
+            var moreIcon = "more_horiz";
             html += '<button is="paper-icon-button-light" class="btnSelectionPanelOptions autoSize" style="margin-left:auto;"><i class="md-icon">' + moreIcon + '</i></button>';
 
             selectionCommandsPanel.innerHTML = html;
 
-            selectionCommandsPanel.querySelector('.btnCloseSelectionPanel').addEventListener('click', hideSelections);
+            selectionCommandsPanel.querySelector(".btnCloseSelectionPanel").addEventListener("click", hideSelections);
 
-            var btnSelectionPanelOptions = selectionCommandsPanel.querySelector('.btnSelectionPanelOptions');
+            var btnSelectionPanelOptions = selectionCommandsPanel.querySelector(".btnSelectionPanelOptions");
 
-            dom.addEventListener(btnSelectionPanelOptions, 'click', showMenuForSelectedItems, { passive: true });
+            dom.addEventListener(btnSelectionPanelOptions, "click", showMenuForSelectedItems, { passive: true });
         }
     }
 
@@ -146,7 +146,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
         return new Promise(function (resolve, reject) {
 
-            require(['alert'], function (alert) {
+            require(["alert"], function (alert) {
                 alert(options).then(resolve, resolve);
             });
         });
@@ -156,15 +156,15 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
         return new Promise(function (resolve, reject) {
 
-            var msg = globalize.translate('ConfirmDeleteItem');
-            var title = globalize.translate('HeaderDeleteItem');
+            var msg = globalize.translate("ConfirmDeleteItem");
+            var title = globalize.translate("HeaderDeleteItem");
 
             if (itemIds.length > 1) {
-                msg = globalize.translate('ConfirmDeleteItems');
-                title = globalize.translate('HeaderDeleteItems');
+                msg = globalize.translate("ConfirmDeleteItems");
+                title = globalize.translate("HeaderDeleteItems");
             }
 
-            require(['confirm'], function (confirm) {
+            require(["confirm"], function (confirm) {
 
                 confirm(msg, title).then(function () {
                     var promises = itemIds.map(function (itemId) {
@@ -173,7 +173,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
                     Promise.all(promises).then(resolve, function () {
 
-                        alertText(globalize.translate('ErrorDeletingItem')).then(reject, reject);
+                        alertText(globalize.translate("ErrorDeletingItem")).then(reject, reject);
                     });
                 }, reject);
 
@@ -190,59 +190,60 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
             var menuItems = [];
 
             menuItems.push({
-                name: globalize.translate('AddToCollection'),
-                id: 'addtocollection',
-                ironIcon: 'add'
+                name: globalize.translate("AddToCollection"),
+                id: "addtocollection",
+                icon: "add"
             });
 
             menuItems.push({
-                name: globalize.translate('AddToPlaylist'),
-                id: 'playlist',
-                ironIcon: 'playlist-add'
+                name: globalize.translate("AddToPlaylist"),
+                id: "playlist",
+                icon: "playlist_add"
             });
 
             // TODO: Be more dynamic based on what is selected
             if (user.Policy.EnableContentDeletion) {
                 menuItems.push({
-                    name: globalize.translate('Delete'),
-                    id: 'delete',
-                    ironIcon: 'delete'
+                    name: globalize.translate("Delete"),
+                    id: "delete",
+                    icon: "delete"
                 });
             }
 
-            if (user.Policy.EnableContentDownloading && appHost.supports('filedownload')) {
+            if (user.Policy.EnableContentDownloading && appHost.supports("filedownload")) {
                 menuItems.push({
-                    name: Globalize.translate('ButtonDownload'),
-                    id: 'download',
-                    ironIcon: 'file-download'
+                    name: Globalize.translate("ButtonDownload"),
+                    id: "download",
+                    icon: "file_download"
                 });
             }
 
             if (user.Policy.IsAdministrator) {
                 menuItems.push({
-                    name: globalize.translate('GroupVersions'),
-                    id: 'groupvideos',
-                    ironIcon: 'call-merge'
+                    name: globalize.translate("GroupVersions"),
+                    id: "groupvideos",
+                    icon: "call_merge"
                 });
             }
 
             menuItems.push({
-                name: globalize.translate('MarkPlayed'),
-                id: 'markplayed'
+                name: globalize.translate("MarkPlayed"),
+                id: "markplayed",
+                icon: "check_box"
             });
 
             menuItems.push({
-                name: globalize.translate('MarkUnplayed'),
-                id: 'markunplayed'
+                name: globalize.translate("MarkUnplayed"),
+                id: "markunplayed",
+                icon: "check_box_outline_blank"
             });
 
             menuItems.push({
-                name: globalize.translate('RefreshMetadata'),
-                id: 'refresh'
+                name: globalize.translate("RefreshMetadata"),
+                id: "refresh",
+                icon: "refresh"
             });
 
-
-
             require(['actionsheet'], function (actionsheet) {
                 actionsheet.show({
                     items: menuItems,
@@ -252,8 +253,8 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
                         var serverId = apiClient.serverInfo().Id;
 
                         switch (id) {
-                            case 'addtocollection':
-                                require(['collectionEditor'], function (collectionEditor) {
+                            case "addtocollection":
+                                require(["collectionEditor"], function (collectionEditor) {
                                     new collectionEditor().show({
                                         items: items,
                                         serverId: serverId
@@ -262,8 +263,8 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
                                 hideSelections();
                                 dispatchNeedsRefresh();
                                 break;
-                            case 'playlist':
-                                require(['playlistEditor'], function (playlistEditor) {
+                            case "playlist":
+                                require(["playlistEditor"], function (playlistEditor) {
                                     new playlistEditor().show({
                                         items: items,
                                         serverId: serverId
@@ -272,30 +273,30 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
                                 hideSelections();
                                 dispatchNeedsRefresh();
                                 break;
-                            case 'delete':
+                            case "delete":
                                 deleteItems(apiClient, items).then(dispatchNeedsRefresh);
                                 hideSelections();
                                 dispatchNeedsRefresh();
                                 break;
-                            case 'groupvideos':
+                            case "groupvideos":
                                 combineVersions(apiClient, items);
                                 break;
-                            case 'markplayed':
+                            case "markplayed":
                                 items.forEach(function (itemId) {
                                     apiClient.markPlayed(apiClient.getCurrentUserId(), itemId);
                                 });
                                 hideSelections();
                                 dispatchNeedsRefresh();
                                 break;
-                            case 'markunplayed':
+                            case "markunplayed":
                                 items.forEach(function (itemId) {
                                     apiClient.markUnplayed(apiClient.getCurrentUserId(), itemId);
                                 });
                                 hideSelections();
                                 dispatchNeedsRefresh();
                                 break;
-                            case 'refresh':
-                                require(['refreshDialog'], function (refreshDialog) {
+                            case "refresh":
+                                require(["refreshDialog"], function (refreshDialog) {
                                     new refreshDialog({
                                         itemIds: items,
                                         serverId: serverId
@@ -320,7 +321,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
         [].forEach.call(selectedElements, function (i) {
 
-            var container = dom.parentWithAttribute(i, 'is', 'emby-itemscontainer');
+            var container = dom.parentWithAttribute(i, "is", "emby-itemscontainer");
 
             if (container && elems.indexOf(container) === -1) {
                 elems.push(container);
@@ -336,9 +337,9 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
         if (selection.length < 2) {
 
-            require(['alert'], function (alert) {
+            require(["alert"], function (alert) {
                 alert({
-                    text: globalize.translate('PleaseSelectTwoItems')
+                    text: globalize.translate("PleaseSelectTwoItems")
                 });
             });
             return;
@@ -349,7 +350,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
         apiClient.ajax({
 
             type: "POST",
-            url: apiClient.getUrl("Videos/MergeVersions", { Ids: selection.join(',') })
+            url: apiClient.getUrl("Videos/MergeVersions", { Ids: selection.join(",") })
 
         }).then(function () {
 
@@ -361,8 +362,8 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
     function showSelections(initialCard) {
 
-        require(['emby-checkbox'], function () {
-            var cards = document.querySelectorAll('.card');
+        require(["emby-checkbox"], function () {
+            var cards = document.querySelectorAll(".card");
             for (var i = 0, length = cards.length; i < length; i++) {
                 showSelection(cards[i], initialCard === cards[i]);
             }
@@ -378,9 +379,9 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
         if (selectedItems.length) {
 
-            var card = dom.parentWithClass(target, 'card');
+            var card = dom.parentWithClass(target, "card");
             if (card) {
-                var itemSelectionPanel = card.querySelector('.itemSelectionPanel');
+                var itemSelectionPanel = card.querySelector(".itemSelectionPanel");
                 if (itemSelectionPanel) {
                     return onItemSelectionPanelClick(e, itemSelectionPanel);
                 }
@@ -392,7 +393,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
         }
     }
 
-    document.addEventListener('viewbeforehide', hideSelections);
+    document.addEventListener("viewbeforehide", hideSelections);
 
     return function (options) {
 
@@ -402,7 +403,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
         function onTapHold(e) {
 
-            var card = dom.parentWithClass(e.target, 'card');
+            var card = dom.parentWithClass(e.target, "card");
 
             if (card) {
 
@@ -439,7 +440,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
                 var element = touch.target;
 
                 if (element) {
-                    var card = dom.parentWithClass(element, 'card');
+                    var card = dom.parentWithClass(element, "card");
 
                     if (card) {
 
@@ -508,7 +509,7 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
                 return;
             }
 
-            var card = dom.parentWithClass(touchTarget, 'card');
+            var card = dom.parentWithClass(touchTarget, "card");
             touchTarget = null;
 
             if (card) {
@@ -521,27 +522,27 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
 
             // mobile safari doesn't allow contextmenu override
             if (browser.touch && !browser.safari) {
-                element.addEventListener('contextmenu', onTapHold);
+                element.addEventListener("contextmenu", onTapHold);
             } else {
-                dom.addEventListener(element, 'touchstart', onTouchStart, {
+                dom.addEventListener(element, "touchstart", onTouchStart, {
                     passive: true
                 });
-                dom.addEventListener(element, 'touchmove', onTouchMove, {
+                dom.addEventListener(element, "touchmove", onTouchMove, {
                     passive: true
                 });
-                dom.addEventListener(element, 'touchend', onTouchEnd, {
+                dom.addEventListener(element, "touchend", onTouchEnd, {
                     passive: true
                 });
-                dom.addEventListener(element, 'touchcancel', onTouchEnd, {
+                dom.addEventListener(element, "touchcancel", onTouchEnd, {
                     passive: true
                 });
-                dom.addEventListener(element, 'mousedown', onMouseDown, {
+                dom.addEventListener(element, "mousedown", onMouseDown, {
                     passive: true
                 });
-                dom.addEventListener(element, 'mouseleave', onMouseOut, {
+                dom.addEventListener(element, "mouseleave", onMouseOut, {
                     passive: true
                 });
-                dom.addEventListener(element, 'mouseup', onMouseOut, {
+                dom.addEventListener(element, "mouseup", onMouseOut, {
                     passive: true
                 });
             }
@@ -550,38 +551,38 @@ define(['browser', 'appStorage', 'apphost', 'loading', 'connectionManager', 'glo
         initTapHold(container);
 
         if (options.bindOnClick !== false) {
-            container.addEventListener('click', onContainerClick);
+            container.addEventListener("click", onContainerClick);
         }
 
         self.onContainerClick = onContainerClick;
 
         self.destroy = function () {
 
-            container.removeEventListener('click', onContainerClick);
-            container.removeEventListener('contextmenu', onTapHold);
+            container.removeEventListener("click", onContainerClick);
+            container.removeEventListener("contextmenu", onTapHold);
 
             var element = container;
 
-            dom.removeEventListener(element, 'touchstart', onTouchStart, {
+            dom.removeEventListener(element, "touchstart", onTouchStart, {
                 passive: true
             });
-            dom.removeEventListener(element, 'touchmove', onTouchMove, {
+            dom.removeEventListener(element, "touchmove", onTouchMove, {
                 passive: true
             });
-            dom.removeEventListener(element, 'touchend', onTouchEnd, {
+            dom.removeEventListener(element, "touchend", onTouchEnd, {
                 passive: true
             });
             // this fires in safari due to magnifying class
-            //dom.removeEventListener(element, 'touchcancel', onTouchEnd, {
+            //dom.removeEventListener(element, "touchcancel", onTouchEnd, {
             //    passive: true
             //});
-            dom.removeEventListener(element, 'mousedown', onMouseDown, {
+            dom.removeEventListener(element, "mousedown", onMouseDown, {
                 passive: true
             });
-            dom.removeEventListener(element, 'mouseleave', onMouseOut, {
+            dom.removeEventListener(element, "mouseleave", onMouseOut, {
                 passive: true
             });
-            dom.removeEventListener(element, 'mouseup', onMouseOut, {
+            dom.removeEventListener(element, "mouseup", onMouseOut, {
                 passive: true
             });
         };
diff --git a/src/components/navdrawer/navdrawer.js b/src/components/navdrawer/navdrawer.js
index cbf5c1eebc..69adbd1f5a 100644
--- a/src/components/navdrawer/navdrawer.js
+++ b/src/components/navdrawer/navdrawer.js
@@ -21,13 +21,13 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
         }
 
         function onMenuTouchMove(e) {
-            var isOpen = self.visible,
-                touches = getTouches(e),
-                touch = touches[0] || {},
-                endX = touch.clientX || 0,
-                endY = touch.clientY || 0,
-                deltaX = endX - (menuTouchStartX || 0),
-                deltaY = endY - (menuTouchStartY || 0);
+            var isOpen = self.visible;
+            var touches = getTouches(e);
+            var touch = touches[0] || {};
+            var endX = touch.clientX || 0;
+            var endY = touch.clientY || 0;
+            var deltaX = endX - (menuTouchStartX || 0);
+            var deltaY = endY - (menuTouchStartY || 0);
             setVelocity(deltaX), isOpen && 1 !== dragMode && deltaX > 0 && (dragMode = 2), 0 === dragMode && (!isOpen || Math.abs(deltaX) >= 10) && Math.abs(deltaY) < 5 ? (dragMode = 1, scrollContainer.addEventListener("scroll", disableEvent), self.showMask()) : 0 === dragMode && Math.abs(deltaY) >= 5 && (dragMode = 2), 1 === dragMode && (newPos = currentPos + deltaX, self.changeMenuPos())
         }
 
@@ -36,12 +36,12 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
             scrollContainer.removeEventListener("scroll", disableEvent);
             dragMode = 0;
 
-            var touches = getTouches(e),
-                touch = touches[0] || {},
-                endX = touch.clientX || 0,
-                endY = touch.clientY || 0,
-                deltaX = endX - (menuTouchStartX || 0),
-                deltaY = endY - (menuTouchStartY || 0);
+            var touches = getTouches(e);
+            var touch = touches[0] || {};
+            var endX = touch.clientX || 0;
+            var endY = touch.clientY || 0;
+            var deltaX = endX - (menuTouchStartX || 0);
+            var deltaY = endY - (menuTouchStartY || 0);
 
             currentPos = deltaX;
             self.checkMenuState(deltaX, deltaY);
@@ -78,15 +78,15 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
         }
 
         function onBackgroundTouchStart(e) {
-            var touches = getTouches(e),
-                touch = touches[0] || {};
+            var touches = getTouches(e);
+            var touch = touches[0] || {};
             backgroundTouchStartX = touch.clientX, backgroundTouchStartTime = (new Date).getTime()
         }
 
         function onBackgroundTouchMove(e) {
-            var touches = getTouches(e),
-                touch = touches[0] || {},
-                endX = touch.clientX || 0;
+            var touches = getTouches(e);
+            var touch = touches[0] || {};
+            var endX = touch.clientX || 0;
             if (endX <= options.width && self.isVisible) {
                 countStart++;
                 var deltaX = endX - (backgroundTouchStartX || 0);
@@ -100,10 +100,10 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
         }
 
         function onBackgroundTouchEnd(e) {
-            var touches = getTouches(e),
-                touch = touches[0] || {},
-                endX = touch.clientX || 0,
-                deltaX = endX - (backgroundTouchStartX || 0);
+            var touches = getTouches(e);
+            var touch = touches[0] || {};
+            var endX = touch.clientX || 0;
+            var deltaX = endX - (backgroundTouchStartX || 0);
             self.checkMenuState(deltaX), countStart = 0
         }
 
@@ -111,21 +111,24 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
             var classList = mask.classList;
             classList.contains("backdrop") || classList.add("hide")
         }
-        var self, defaults, mask, newPos = 0,
-            currentPos = 0,
-            startPoint = 0,
-            countStart = 0,
-            velocity = 0;
+        var self;
+        var defaults;
+        var mask;
+        var newPos = 0;
+        var currentPos = 0;
+        var startPoint = 0;
+        var countStart = 0;
+        var velocity = 0;
         options.target.classList.add("transition");
-        var dragMode = 0,
-            scrollContainer = options.target.querySelector(".mainDrawer-scrollContainer");
+        var dragMode = 0;
+        var scrollContainer = options.target.querySelector(".mainDrawer-scrollContainer");
         scrollContainer.classList.add("scrollY");
         var TouchMenuLA = function() {
             self = this, defaults = {
                 width: 260,
                 handleSize: 10,
                 disableMask: !1,
-                maxMaskOpacity: .5
+                maxMaskOpacity: 0.5
             }, this.isVisible = !1, this.initialize()
         };
         TouchMenuLA.prototype.initElements = function() {
@@ -133,8 +136,11 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
                 passive: !0
             }))
         };
-        var menuTouchStartX, menuTouchStartY, menuTouchStartTime, edgeContainer = document.querySelector(".mainDrawerHandle"),
-            isPeeking = !1;
+        var menuTouchStartX;
+        var menuTouchStartY;
+        var menuTouchStartTime;
+        var edgeContainer = document.querySelector(".mainDrawerHandle");
+        var isPeeking = false;
         TouchMenuLA.prototype.animateToPosition = function(pos) {
             requestAnimationFrame(function() {
                 options.target.style.transform = pos ? "translateX(" + pos + "px)" : "none"
@@ -146,7 +152,7 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
                 self.close()
             })
         }, TouchMenuLA.prototype.checkMenuState = function(deltaX, deltaY) {
-            velocity >= .4 ? deltaX >= 0 || Math.abs(deltaY || 0) >= 70 ? self.open() : self.close() : newPos >= 100 ? self.open() : newPos && self.close()
+            velocity >= 0.4 ? deltaX >= 0 || Math.abs(deltaY || 0) >= 70 ? self.open() : self.close() : newPos >= 100 ? self.open() : newPos && self.close()
         }, TouchMenuLA.prototype.open = function() {
             this.animateToPosition(options.width), currentPos = options.width, this.isVisible = !0, options.target.classList.add("drawer-open"), self.showMask(), self.invoke(options.onChange)
         }, TouchMenuLA.prototype.close = function() {
@@ -154,7 +160,8 @@ define(["browser", "dom", "css!./navdrawer", "scrollStyles"], function(browser,
         }, TouchMenuLA.prototype.toggle = function() {
             self.isVisible ? self.close() : self.open()
         };
-        var backgroundTouchStartX, backgroundTouchStartTime;
+        var backgroundTouchStartX;
+        var backgroundTouchStartTime;
         TouchMenuLA.prototype.showMask = function() {
             mask.classList.remove("hide"), mask.offsetWidth, mask.classList.add("backdrop")
         }, TouchMenuLA.prototype.hideMask = function() {
diff --git a/src/components/notifications/notifications.js b/src/components/notifications/notifications.js
index 304eec7e08..62de365d99 100644
--- a/src/components/notifications/notifications.js
+++ b/src/components/notifications/notifications.js
@@ -21,8 +21,7 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
 
             if (notification.close) {
                 notification.close();
-            }
-            else if (notification.cancel) {
+            } else if (notification.cancel) {
                 notification.cancel();
             }
         }, timeoutMs);
@@ -180,15 +179,12 @@ define(['serverNotifications', 'playbackManager', 'events', 'globalize', 'requir
             if (status === 'completed') {
                 notification.title = globalize.translate('PackageInstallCompleted').replace('{0}', installation.Name + ' ' + installation.Version);
                 notification.vibrate = true;
-            }
-            else if (status === 'cancelled') {
+            } else if (status === 'cancelled') {
                 notification.title = globalize.translate('PackageInstallCancelled').replace('{0}', installation.Name + ' ' + installation.Version);
-            }
-            else if (status === 'failed') {
+            } else if (status === 'failed') {
                 notification.title = globalize.translate('PackageInstallFailed').replace('{0}', installation.Name + ' ' + installation.Version);
                 notification.vibrate = true;
-            }
-            else if (status === 'progress') {
+            } else if (status === 'progress') {
                 notification.title = globalize.translate('InstallingPackage').replace('{0}', installation.Name + ' ' + installation.Version);
 
                 notification.actions =
diff --git a/src/components/nowplayingbar/nowplayingbar.js b/src/components/nowplayingbar/nowplayingbar.js
index 9fac61ba1f..37a1a32f56 100644
--- a/src/components/nowplayingbar/nowplayingbar.js
+++ b/src/components/nowplayingbar/nowplayingbar.js
@@ -42,31 +42,31 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
         // The onclicks are needed due to the return false above
         html += '<div class="nowPlayingBarCenter">';
 
-        html += '<button is="paper-icon-button-light" class="previousTrackButton mediaButton"><i class="md-icon">&#xE045;</i></button>';
+        html += '<button is="paper-icon-button-light" class="previousTrackButton mediaButton"><i class="md-icon">skip_previous</i></button>';
 
-        html += '<button is="paper-icon-button-light" class="playPauseButton mediaButton"><i class="md-icon">&#xE034;</i></button>';
+        html += '<button is="paper-icon-button-light" class="playPauseButton mediaButton"><i class="md-icon">pause</i></button>';
 
         html += '<button is="paper-icon-button-light" class="stopButton mediaButton"><i class="md-icon">stop</i></button>';
-        html += '<button is="paper-icon-button-light" class="nextTrackButton mediaButton"><i class="md-icon">&#xE044;</i></button>';
+        html += '<button is="paper-icon-button-light" class="nextTrackButton mediaButton"><i class="md-icon">skip_next</i></button>';
 
         html += '<div class="nowPlayingBarCurrentTime"></div>';
         html += '</div>';
 
         html += '<div class="nowPlayingBarRight">';
 
-        html += '<button is="paper-icon-button-light" class="muteButton mediaButton"><i class="md-icon">&#xE050;</i></button>';
+        html += '<button is="paper-icon-button-light" class="muteButton mediaButton"><i class="md-icon">volume_up</i></button>';
 
         html += '<div class="sliderContainer nowPlayingBarVolumeSliderContainer hide" style="width:9em;vertical-align:middle;display:inline-flex;">';
         html += '<input type="range" is="emby-slider" pin step="1" min="0" max="100" value="0" class="slider-medium-thumb nowPlayingBarVolumeSlider"/>';
         html += '</div>';
 
-        html += '<button is="paper-icon-button-light" class="toggleRepeatButton mediaButton"><i class="md-icon">&#xE040;</i></button>';
+        html += '<button is="paper-icon-button-light" class="toggleRepeatButton mediaButton"><i class="md-icon">repeat</i></button>';
 
         html += '<div class="nowPlayingBarUserDataButtons">';
         html += '</div>';
 
-        html += '<button is="paper-icon-button-light" class="playPauseButton mediaButton"><i class="md-icon">&#xE034;</i></button>';
-        html += '<button is="paper-icon-button-light" class="remoteControlButton mediaButton"><i class="md-icon">&#xE05F;</i></button>';
+        html += '<button is="paper-icon-button-light" class="playPauseButton mediaButton"><i class="md-icon">pause</i></button>';
+        html += '<button is="paper-icon-button-light" class="remoteControlButton mediaButton"><i class="md-icon">playlist_play</i></button>';
 
         html += '</div>';
         html += '</div>';
@@ -134,7 +134,8 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
             }
         });
 
-        var i, length;
+        var i;
+        var length;
         playPauseButtons = elem.querySelectorAll('.playPauseButton');
         for (i = 0, length = playPauseButtons.length; i < length; i++) {
             playPauseButtons[i].addEventListener('click', onPlayPauseClick);
@@ -195,7 +196,6 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
         volumeSlider.addEventListener('mousemove', setVolume);
         volumeSlider.addEventListener('touchmove', setVolume);
 
-
         positionSlider = elem.querySelector('.nowPlayingBarPositionSlider');
         positionSlider.addEventListener('change', function () {
 
@@ -282,8 +282,8 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
     }
 
     function updatePlayPauseState(isPaused) {
-
-        var i, length;
+        var i;
+        var length;
 
         if (playPauseButtons) {
             if (isPaused) {
@@ -345,8 +345,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
         if (repeatMode === 'RepeatAll') {
             toggleRepeatButtonIcon.innerHTML = "repeat";
             toggleRepeatButton.classList.add('repeatButton-active');
-        }
-        else if (repeatMode === 'RepeatOne') {
+        } else if (repeatMode === 'RepeatOne') {
             toggleRepeatButtonIcon.innerHTML = "repeat_one";
             toggleRepeatButton.classList.add('repeatButton-active');
         } else {
@@ -401,9 +400,9 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
         }
 
         if (isMuted) {
-            muteButton.querySelector('i').innerHTML = '&#xE04F;';
+            muteButton.querySelector('i').innerHTML = 'volume_off';
         } else {
-            muteButton.querySelector('i').innerHTML = '&#xE050;';
+            muteButton.querySelector('i').innerHTML = 'volume_up';
         }
 
         if (progressElement) {
@@ -572,7 +571,7 @@ define(['require', 'datetime', 'itemHelper', 'events', 'browser', 'imageLoader',
                     var userData = item.UserData || {};
                     var likes = userData.Likes == null ? '' : userData.Likes;
 
-                    nowPlayingUserData.innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton mediaButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><i class="md-icon">&#xE87D;</i></button>';
+                    nowPlayingUserData.innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton mediaButton paper-icon-button-light" data-id="' + item.Id + '" data-serverid="' + item.ServerId + '" data-itemtype="' + item.Type + '" data-likes="' + likes + '" data-isfavorite="' + (userData.IsFavorite) + '"><i class="md-icon">favorite</i></button>';
                 });
 
             }
diff --git a/src/components/playback/autoplaydetect.js b/src/components/playback/autoplaydetect.js
index 7a7a73a538..3610eef2ab 100644
--- a/src/components/playback/autoplaydetect.js
+++ b/src/components/playback/autoplaydetect.js
@@ -48,9 +48,7 @@ define([], function () {
                 }
 
                 timeout = setTimeout(testAutoplay, 500);
-            }
-
-            catch (e) {
+            } catch (e) {
                 reject();
                 return;
             }
diff --git a/src/components/playback/brightnessosd.js b/src/components/playback/brightnessosd.js
index 1797463f29..b2bf9d4106 100644
--- a/src/components/playback/brightnessosd.js
+++ b/src/components/playback/brightnessosd.js
@@ -11,7 +11,7 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
     function getOsdElementHtml() {
         var html = '';
 
-        html += '<i class="md-icon iconOsdIcon">&#xE1AC;</i>';
+        html += '<i class="md-icon iconOsdIcon">brightness_high</i>';
 
         html += '<div class="iconOsdProgressOuter"><div class="iconOsdProgressInner brightnessOsdProgressInner"></div></div>';
 
@@ -102,12 +102,11 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
 
         if (iconElement) {
             if (brightness >= 80) {
-                iconElement.innerHTML = '&#xE1AC;';
-            }
-            else if (brightness >= 20) {
-                iconElement.innerHTML = '&#xE1AE;';
+                iconElement.innerHTML = 'brightness_high';
+            } else if (brightness >= 20) {
+                iconElement.innerHTML = 'brightness_medium';
             } else {
-                iconElement.innerHTML = '&#xE1AD;';
+                iconElement.innerHTML = 'brightness_low';
             }
         }
         if (progressElement) {
@@ -162,4 +161,4 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
 
     bindToPlayer(playbackManager.getCurrentPlayer());
 
-});
\ No newline at end of file
+});
diff --git a/src/components/playback/mediasession.js b/src/components/playback/mediasession.js
index 63e0bde6c1..7f4b9f519e 100644
--- a/src/components/playback/mediasession.js
+++ b/src/components/playback/mediasession.js
@@ -158,7 +158,7 @@ define(['playbackManager', 'nowPlayingHelper', 'events', 'connectionManager'], f
 
         lastUpdateTime = now;
 
-        if (navigator.mediaSession){
+        if (navigator.mediaSession) {
             navigator.mediaSession.metadata = new MediaMetadata({
                 title: title,
                 artist: artist,
@@ -278,7 +278,6 @@ define(['playbackManager', 'nowPlayingHelper', 'events', 'connectionManager'], f
     }
     if (navigator.mediaSession) {
 
-
         navigator.mediaSession.setActionHandler('previoustrack', function () {
             execute('previousTrack');
         });
diff --git a/src/components/playback/nowplayinghelper.js b/src/components/playback/nowplayinghelper.js
index d5803b426f..b1af977ab0 100644
--- a/src/components/playback/nowplayinghelper.js
+++ b/src/components/playback/nowplayinghelper.js
@@ -43,8 +43,7 @@ define([], function () {
         } else if (nowPlayingItem.Artists && nowPlayingItem.Artists.length) {
 
             bottomText = nowPlayingItem.Artists.join(', ');
-        }
-        else if (nowPlayingItem.SeriesName || nowPlayingItem.Album) {
+        } else if (nowPlayingItem.SeriesName || nowPlayingItem.Album) {
             bottomText = topText;
             topText = nowPlayingItem.SeriesName || nowPlayingItem.Album;
 
@@ -60,8 +59,7 @@ define([], function () {
             } else {
                 topItem = null;
             }
-        }
-        else if (nowPlayingItem.ProductionYear && includeNonNameInfo !== false) {
+        } else if (nowPlayingItem.ProductionYear && includeNonNameInfo !== false) {
             bottomText = nowPlayingItem.ProductionYear;
         }
 
diff --git a/src/components/playback/playbackmanager.js b/src/components/playback/playbackmanager.js
index 13497e1912..23f0d4572e 100644
--- a/src/components/playback/playbackmanager.js
+++ b/src/components/playback/playbackmanager.js
@@ -107,8 +107,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     TotalRecordCount: 1
                 };
             });
-        }
-        else {
+        } else {
 
             query.Limit = query.Limit || 300;
             query.Fields = "Chapters";
@@ -182,8 +181,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             if (container === 'm4a') {
                 return 'audio/mp4';
             }
-        }
-        else if (type === 'video') {
+        } else if (type === 'video') {
             if (container === 'mkv') {
                 return 'video/x-matroska';
             }
@@ -212,8 +210,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         var results = regex.exec(url);
         if (results == null) {
             return "";
-        }
-        else {
+        } else {
             return decodeURIComponent(results[1].replace(/\+/g, " "));
         }
     }
@@ -649,13 +646,10 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                 // If this is the only way it can be played, then allow it
                 if (!mediaSource.SupportsDirectStream && !mediaSource.SupportsTranscoding) {
                     return Promise.resolve(true);
-                }
-                else {
+                } else {
                     return isHostReachable(mediaSource, apiClient);
                 }
-            }
-
-            else if (mediaSource.Protocol === 'File') {
+            } else if (mediaSource.Protocol === 'File') {
 
                 return new Promise(function (resolve, reject) {
 
@@ -1272,7 +1266,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
             var currentMediaSource = self.currentMediaSource(player);
             var mediaStreams = [];
-            var i, length;
+            var i;
+            var length;
             for (i = 0, length = currentMediaSource.MediaStreams.length; i < length; i++) {
                 if (currentMediaSource.MediaStreams[i].Type === 'Audio') {
                     mediaStreams.push(currentMediaSource.MediaStreams[i]);
@@ -1316,7 +1311,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
             var currentMediaSource = self.currentMediaSource(player);
             var mediaStreams = [];
-            var i, length;
+            var i;
+            var length;
             for (i = 0, length = currentMediaSource.MediaStreams.length; i < length; i++) {
                 if (currentMediaSource.MediaStreams[i].Type === 'Subtitle') {
                     mediaStreams.push(currentMediaSource.MediaStreams[i]);
@@ -1360,7 +1356,8 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
         function isAudioStreamSupported(mediaSource, index, deviceProfile) {
 
             var mediaStream;
-            var i, length;
+            var i;
+            var length;
             var mediaStreams = mediaSource.MediaStreams;
 
             for (i = 0, length = mediaStreams.length; i < length; i++) {
@@ -1423,8 +1420,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     if (isAudioStreamSupported(self.currentMediaSource(player), index, profile)) {
                         player.setAudioStreamIndex(index);
                         getPlayerData(player).audioStreamIndex = index;
-                    }
-                    else {
+                    } else {
                         changeStream(player, getCurrentTicks(player), { AudioStreamIndex: index });
                         getPlayerData(player).audioStreamIndex = index;
                     }
@@ -1595,8 +1591,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     // Need to change the transcoded stream to remove subs
                     changeStream(player, getCurrentTicks(player), { SubtitleStreamIndex: -1 });
                 }
-            }
-            else if (!currentStream && newStream) {
+            } else if (!currentStream && newStream) {
 
                 if (getDeliveryMethod(newStream) === 'External') {
                     selectedTrackElementIndex = index;
@@ -1607,8 +1602,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     // Need to change the transcoded stream to add subs
                     changeStream(player, getCurrentTicks(player), { SubtitleStreamIndex: index });
                 }
-            }
-            else if (currentStream && newStream) {
+            } else if (currentStream && newStream) {
 
                 // Switching tracks
                 // We can handle this clientside if the new track is external or the new track is embedded and we're not transcoding
@@ -1645,7 +1639,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             player = player || self._currentPlayer;
             if (player.disableShowingSubtitleOffset) {
                 player.disableShowingSubtitleOffset();
-            }            
+            }
         }
 
         self.isShowingSubtitleOffsetEnabled = function(player) {
@@ -1674,7 +1668,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
         self.canHandleOffsetOnCurrentSubtitle = function(player) {
             var index = self.getSubtitleStreamIndex(player);
-            return index !== -1  && self.isSubtitleStreamExternal(index, player);
+            return index !== -1 && self.isSubtitleStreamExternal(index, player);
         }
 
         self.seek = function (ticks, player) {
@@ -1865,17 +1859,15 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
             if (firstItem.Type === "Program") {
 
                 promise = getItemsForPlayback(serverId, {
-                    Ids: firstItem.ChannelId,
+                    Ids: firstItem.ChannelId
                 });
-            }
-            else if (firstItem.Type === "Playlist") {
+            } else if (firstItem.Type === "Playlist") {
 
                 promise = getItemsForPlayback(serverId, {
                     ParentId: firstItem.Id,
                     SortBy: options.shuffle ? 'Random' : null
                 });
-            }
-            else if (firstItem.Type === "MusicArtist") {
+            } else if (firstItem.Type === "MusicArtist") {
 
                 promise = getItemsForPlayback(serverId, {
                     ArtistIds: firstItem.Id,
@@ -1885,8 +1877,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     MediaTypes: "Audio"
                 });
 
-            }
-            else if (firstItem.MediaType === "Photo") {
+            } else if (firstItem.MediaType === "Photo") {
 
                 promise = getItemsForPlayback(serverId, {
                     ParentId: firstItem.ParentId,
@@ -1915,8 +1906,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     return Promise.resolve(result);
 
                 });
-            }
-            else if (firstItem.Type === "PhotoAlbum") {
+            } else if (firstItem.Type === "PhotoAlbum") {
 
                 promise = getItemsForPlayback(serverId, {
                     ParentId: firstItem.Id,
@@ -1928,8 +1918,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     Limit: 1000
 
                 });
-            }
-            else if (firstItem.Type === "MusicGenre") {
+            } else if (firstItem.Type === "MusicGenre") {
 
                 promise = getItemsForPlayback(serverId, {
                     GenreIds: firstItem.Id,
@@ -1938,8 +1927,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     SortBy: options.shuffle ? 'Random' : 'SortName',
                     MediaTypes: "Audio"
                 });
-            }
-            else if (firstItem.IsFolder) {
+            } else if (firstItem.IsFolder) {
 
                 promise = getItemsForPlayback(serverId, mergePlaybackQueries({
 
@@ -1951,8 +1939,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                     MediaTypes: "Audio,Video"
 
                 }, queryOptions));
-            }
-            else if (firstItem.Type === "Episode" && items.length === 1 && getPlayer(firstItem, options).supportsProgress !== false) {
+            } else if (firstItem.Type === "Episode" && items.length === 1 && getPlayer(firstItem, options).supportsProgress !== false) {
 
                 promise = new Promise(function (resolve, reject) {
                     var apiClient = connectionManager.getApiClient(firstItem.ServerId);
@@ -2537,16 +2524,12 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
                     playMethod = 'DirectPlay';
 
-                }
-
-                else if (mediaSource.StreamUrl) {
+                } else if (mediaSource.StreamUrl) {
 
                     // Only used for audio
                     playMethod = 'Transcode';
                     mediaUrl = mediaSource.StreamUrl;
-                }
-
-                else if (mediaSource.SupportsDirectStream) {
+                } else if (mediaSource.SupportsDirectStream) {
 
                     directOptions = {
                         Static: true,
@@ -2706,9 +2689,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
                             return p.canPlayItem(item, playOptions);
                         }
                         return true;
-                    }
-
-                    else if (item.Url && p.canPlayUrl) {
+                    } else if (item.Url && p.canPlayUrl) {
                         return p.canPlayUrl(item.Url);
                     }
                 }
@@ -3222,8 +3203,7 @@ define(['events', 'datetime', 'appSettings', 'itemHelper', 'pluginManager', 'pla
 
             if (displayErrorCode && typeof (displayErrorCode) === 'string') {
                 showPlaybackInfoErrorMessage(self, displayErrorCode, nextItem);
-            }
-            else if (nextItem) {
+            } else if (nextItem) {
                 self.nextTrack();
             }
         }
diff --git a/src/components/playback/playbackorientation.js b/src/components/playback/playbackorientation.js
index 731d9c3c42..3253d8acdf 100644
--- a/src/components/playback/playbackorientation.js
+++ b/src/components/playback/playbackorientation.js
@@ -29,8 +29,7 @@ define(['playbackManager', 'layoutManager', 'events'], function (playbackManager
                         // returns a boolean
                         orientationLocked = promise;
                     }
-                }
-                catch (err) {
+                } catch (err) {
                     onOrientationChangeError(err);
                 }
             }
@@ -46,8 +45,7 @@ define(['playbackManager', 'layoutManager', 'events'], function (playbackManager
             if (unlockOrientation) {
                 try {
                     unlockOrientation();
-                }
-                catch (err) {
+                } catch (err) {
                     console.log('error unlocking orientation: ' + err);
                 }
                 orientationLocked = false;
diff --git a/src/components/playback/playerSelectionMenu.js b/src/components/playback/playerSelectionMenu.js
index 2102720e9a..97e6e46230 100644
--- a/src/components/playback/playerSelectionMenu.js
+++ b/src/components/playback/playerSelectionMenu.js
@@ -63,17 +63,17 @@ define(['appSettings', 'events', 'browser', 'loading', 'playbackManager', 'appRo
         switch (deviceType) {
 
             case 'smartphone':
-                return '&#xE32C;';
+                return 'smartphone';
             case 'tablet':
-                return '&#xE32F;';
+                return 'tablet';
             case 'tv':
-                return '&#xE333;';
+                return 'tv';
             case 'cast':
-                return '&#xE307;';
+                return 'cast';
             case 'desktop':
-                return '&#xE30A;';
+                return 'computer';
             default:
-                return '&#xE333;';
+                return 'tv';
         }
     }
 
@@ -153,7 +153,6 @@ define(['appSettings', 'events', 'browser', 'loading', 'playbackManager', 'appRo
         });
     }
 
-
     function disconnectFromPlayer(currentDeviceName) {
 
         if (playbackManager.getSupportedCommands().indexOf('EndSession') !== -1) {
@@ -193,7 +192,6 @@ define(['appSettings', 'events', 'browser', 'loading', 'playbackManager', 'appRo
 
             });
 
-
         } else {
 
             playbackManager.setDefaultPlayerActive();
@@ -275,8 +273,7 @@ define(['appSettings', 'events', 'browser', 'loading', 'playbackManager', 'appRo
         dialogHelper.open(dlg).then(function () {
             if (destination === 'nowplaying') {
                 appRouter.showNowPlaying();
-            }
-            else if (destination === 'disconnectFromPlayer') {
+            } else if (destination === 'disconnectFromPlayer') {
                 disconnectFromPlayer(currentDeviceName);
             }
         }, emptyCallback);
@@ -320,4 +317,4 @@ define(['appSettings', 'events', 'browser', 'loading', 'playbackManager', 'appRo
     return {
         show: showPlayerSelection
     };
-});
\ No newline at end of file
+});
diff --git a/src/components/playback/playmethodhelper.js b/src/components/playback/playmethodhelper.js
index 58458aa399..4e85f87093 100644
--- a/src/components/playback/playmethodhelper.js
+++ b/src/components/playback/playmethodhelper.js
@@ -9,14 +9,11 @@ define([], function () {
 
         if (session.TranscodingInfo && session.TranscodingInfo.IsVideoDirect) {
             return 'DirectStream';
-        }
-        else if (session.PlayState.PlayMethod === 'Transcode') {
+        } else if (session.PlayState.PlayMethod === 'Transcode') {
             return 'Transcode';
-        }
-        else if (session.PlayState.PlayMethod === 'DirectStream') {
+        } else if (session.PlayState.PlayMethod === 'DirectStream') {
             return 'DirectPlay';
-        }
-        else if (session.PlayState.PlayMethod === 'DirectPlay') {
+        } else if (session.PlayState.PlayMethod === 'DirectPlay') {
             return 'DirectPlay';
         }
     }
diff --git a/src/components/playback/playqueuemanager.js b/src/components/playback/playqueuemanager.js
index 2cbaf1d9f4..ed2076a814 100644
--- a/src/components/playback/playqueuemanager.js
+++ b/src/components/playback/playqueuemanager.js
@@ -58,15 +58,15 @@ define([], function () {
 
     function arrayInsertAt(destArray, pos, arrayToInsert) {
         var args = [];
-        args.push(pos);                           // where to insert
-        args.push(0);                             // nothing to remove
-        args = args.concat(arrayToInsert);        // add on array to insert
-        destArray.splice.apply(destArray, args);  // splice it in
+        args.push(pos); // where to insert
+        args.push(0); // nothing to remove
+        args = args.concat(arrayToInsert); // add on array to insert
+        destArray.splice.apply(destArray, args); // splice it in
     }
 
     PlayQueueManager.prototype.queueNext = function (items) {
-
-        var i, length;
+        var i;
+        var length;
 
         for (i = 0, length = items.length; i < length; i++) {
 
diff --git a/src/components/playback/volumeosd.js b/src/components/playback/volumeosd.js
index c7a3438d54..b622cc18b1 100644
--- a/src/components/playback/volumeosd.js
+++ b/src/components/playback/volumeosd.js
@@ -11,7 +11,7 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
     function getOsdElementHtml() {
         var html = '';
 
-        html += '<i class="md-icon iconOsdIcon">&#xE050;</i>';
+        html += '<i class="md-icon iconOsdIcon">volume_up</i>';
 
         html += '<div class="iconOsdProgressOuter"><div class="iconOsdProgressInner"></div></div>';
 
@@ -101,7 +101,7 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
     function updatePlayerVolumeState(isMuted, volume) {
 
         if (iconElement) {
-            iconElement.innerHTML = isMuted ? '&#xE04F;' : '&#xE050;';
+            iconElement.innerHTML = isMuted ? 'volume_off' : 'volume_up';
         }
         if (progressElement) {
             progressElement.style.width = (volume || 0) + '%';
@@ -155,4 +155,4 @@ define(['events', 'playbackManager', 'dom', 'browser', 'css!./iconosd', 'materia
 
     bindToPlayer(playbackManager.getCurrentPlayer());
 
-});
\ No newline at end of file
+});
diff --git a/src/components/playerstats/playerstats.js b/src/components/playerstats/playerstats.js
index 5e097f2fe2..4179192dd2 100644
--- a/src/components/playerstats/playerstats.js
+++ b/src/components/playerstats/playerstats.js
@@ -364,8 +364,7 @@ define(['events', 'globalize', 'playbackManager', 'connectionManager', 'playMeth
                 var category = playerStats[i];
                 if (category.type === 'audio') {
                     category.name = 'Audio Info';
-                }
-                else if (category.type === 'video') {
+                } else if (category.type === 'video') {
                     category.name = 'Video Info';
                 }
                 categories.push(category);
diff --git a/src/components/playlisteditor/playlisteditor.js b/src/components/playlisteditor/playlisteditor.js
index 0379e56347..4738211a5e 100644
--- a/src/components/playlisteditor/playlisteditor.js
+++ b/src/components/playlisteditor/playlisteditor.js
@@ -258,7 +258,7 @@ define(['shell', 'dialogHelper', 'loading', 'layoutManager', 'playbackManager',
         var title = globalize.translate('HeaderAddToPlaylist');
 
         html += '<div class="formDialogHeader">';
-        html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
+        html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
         html += '<h3 class="formDialogHeaderTitle">';
         html += title;
         html += '</h3>';
@@ -295,4 +295,4 @@ define(['shell', 'dialogHelper', 'loading', 'layoutManager', 'playbackManager',
     };
 
     return PlaylistEditor;
-});
\ No newline at end of file
+});
diff --git a/src/components/prompt/prompt.template.html b/src/components/prompt/prompt.template.html
index 200c98b116..b1e7f580f0 100644
--- a/src/components/prompt/prompt.template.html
+++ b/src/components/prompt/prompt.template.html
@@ -1,6 +1,6 @@
 <div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
-        <i class="md-icon">&#xE5C4;</i>
+        <i class="md-icon">arrow_back</i>
     </button>
     <h3 class="formDialogHeaderTitle"></h3>
 </div>
@@ -22,4 +22,4 @@
 
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/components/recordingcreator/recordingbutton.js b/src/components/recordingcreator/recordingbutton.js
index 0a76d3914c..a32803e107 100644
--- a/src/components/recordingcreator/recordingbutton.js
+++ b/src/components/recordingcreator/recordingbutton.js
@@ -30,7 +30,7 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom'
             this.refresh(options.itemId, options.serverId);
         }
         var button = options.button;
-        button.querySelector('i').innerHTML = '&#xE061;';
+        button.querySelector('i').innerHTML = 'fiber_manual_record';
 
         var clickFn = onRecordingButtonClick.bind(this);
         this.clickFn = clickFn;
@@ -45,28 +45,25 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom'
         var status;
 
         if (item.Type === 'SeriesTimer') {
-            return '&#xE062;';
-        }
-        else if (item.TimerId || item.SeriesTimerId) {
+            return 'fiber_smart_record';
+        } else if (item.TimerId || item.SeriesTimerId) {
 
             status = item.Status || 'Cancelled';
-        }
-        else if (item.Type === 'Timer') {
+        } else if (item.Type === 'Timer') {
 
             status = item.Status;
-        }
-        else {
-            return '&#xE061;';
+        } else {
+            return 'fiber_manual_record';
         }
 
         if (item.SeriesTimerId) {
 
             if (status !== 'Cancelled') {
-                return '&#xE062;';
+                return 'fiber_smart_record';
             }
         }
 
-        return '&#xE061;';
+        return 'fiber_manual_record';
     }
 
     RecordingButton.prototype.refresh = function (serverId, itemId) {
@@ -113,4 +110,4 @@ define(['globalize', 'connectionManager', 'require', 'loading', 'apphost', 'dom'
     };
 
     return RecordingButton;
-});
\ No newline at end of file
+});
diff --git a/src/components/recordingcreator/recordingcreator.js b/src/components/recordingcreator/recordingcreator.js
index b3d16a0dab..614d483b21 100644
--- a/src/components/recordingcreator/recordingcreator.js
+++ b/src/components/recordingcreator/recordingcreator.js
@@ -40,8 +40,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
                 maxHeight: imageHeight,
                 tag: item.ImageTags.Primary
             });
-        }
-        else if (imageTags.Thumb) {
+        } else if (imageTags.Thumb) {
 
             return apiClient.getScaledImageUrl(item.Id, {
                 type: "Thumb",
diff --git a/src/components/recordingcreator/recordingcreator.template.html b/src/components/recordingcreator/recordingcreator.template.html
index 386aa149cc..2a2840aecc 100644
--- a/src/components/recordingcreator/recordingcreator.template.html
+++ b/src/components/recordingcreator/recordingcreator.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
     <h3 class="formDialogHeaderTitle"></h3>
 </div>
 <div class="formDialogContent smoothScrollY">
@@ -28,4 +28,4 @@
             </button>
         </div>
     </form>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/components/recordingcreator/recordingeditor.js b/src/components/recordingcreator/recordingeditor.js
index 69b8b1023b..3a1d4ba943 100644
--- a/src/components/recordingcreator/recordingeditor.js
+++ b/src/components/recordingcreator/recordingeditor.js
@@ -95,7 +95,6 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
             currentResolve = resolve;
 
             require(['text!./recordingeditor.template.html'], function (template) {
-
                 var dialogOptions = {
                     removeOnClose: true,
                     scrollY: false
@@ -103,7 +102,6 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
 
                 if (layoutManager.tv) {
                     dialogOptions.size = 'fullscreen';
-                } else {
                 }
 
                 var dlg = dialogHelper.createDialog(dialogOptions);
diff --git a/src/components/recordingcreator/recordingeditor.template.html b/src/components/recordingcreator/recordingeditor.template.html
index e36dda3f57..6b853704f3 100644
--- a/src/components/recordingcreator/recordingeditor.template.html
+++ b/src/components/recordingcreator/recordingeditor.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
     <h3 class="formDialogHeaderTitle">
         ${HeaderRecordingOptions}
     </h3>
@@ -43,4 +43,4 @@
 
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/components/recordingcreator/recordingfields.template.html b/src/components/recordingcreator/recordingfields.template.html
index 76ea5cee25..622b0d62e7 100644
--- a/src/components/recordingcreator/recordingfields.template.html
+++ b/src/components/recordingcreator/recordingfields.template.html
@@ -2,7 +2,7 @@
     <div class="recordSeriesContainer recordingFields-buttons flex align-items-center hide">
         <div>
             <button is="emby-button" type="button" class="raised recordingButton seriesRecordingButton">
-                <i class="md-icon recordingIcon">&#xE062;</i>
+                <i class="md-icon recordingIcon">fiber_smart_record</i>
                 <span class="buttonText">${RecordSeries}</span>
             </button>
         </div>
@@ -14,7 +14,7 @@
     <div class="recordingFields-buttons flex align-items-center">
         <div>
             <button is="emby-button" type="button" class="raised recordingButton singleRecordingButton">
-                <i class="md-icon recordingIcon">&#xE061;</i>
+                <i class="md-icon recordingIcon">fiber_manual_record</i>
                 <span class="buttonText">${Record}</span>
             </button>
         </div>
@@ -22,4 +22,4 @@
             <span class="manageButtonText">${Settings}</span>
         </button>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/components/recordingcreator/recordinghelper.js b/src/components/recordingcreator/recordinghelper.js
index 8c56b578c9..4bfd316c73 100644
--- a/src/components/recordingcreator/recordinghelper.js
+++ b/src/components/recordingcreator/recordinghelper.js
@@ -166,8 +166,7 @@ define(['globalize', 'loading', 'connectionManager'], function (globalize, loadi
                         loading.show();
 
                         cancelTimer(apiClient, timerId, true).then(resolve, reject);
-                    }
-                    else if (result === 'cancelseriestimer') {
+                    } else if (result === 'cancelseriestimer') {
 
                         loading.show();
 
diff --git a/src/components/recordingcreator/seriesrecordingeditor.js b/src/components/recordingcreator/seriesrecordingeditor.js
index 9878081e67..73a98cf5e7 100644
--- a/src/components/recordingcreator/seriesrecordingeditor.js
+++ b/src/components/recordingcreator/seriesrecordingeditor.js
@@ -139,7 +139,7 @@ define(['dialogHelper', 'globalize', 'layoutManager', 'mediaInfo', 'apphost', 'c
 
         context.querySelector('.selectKeepUpTo').innerHTML = html;
     }
-    
+
     function onFieldChange(e) {
         this.querySelector('.btnSubmit').click();
     }
diff --git a/src/components/recordingcreator/seriesrecordingeditor.template.html b/src/components/recordingcreator/seriesrecordingeditor.template.html
index 54133ebbbb..c2e8ebd0ed 100644
--- a/src/components/recordingcreator/seriesrecordingeditor.template.html
+++ b/src/components/recordingcreator/seriesrecordingeditor.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
     <h3 class="formDialogHeaderTitle">
         ${HeaderSeriesOptions}
     </h3>
@@ -75,4 +75,4 @@
 
         </form>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/components/refreshdialog/refreshdialog.js b/src/components/refreshdialog/refreshdialog.js
index 6650170960..30074b4d0b 100644
--- a/src/components/refreshdialog/refreshdialog.js
+++ b/src/components/refreshdialog/refreshdialog.js
@@ -123,7 +123,7 @@ define(['shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionManager'
         var title = globalize.translate('RefreshMetadata');
 
         html += '<div class="formDialogHeader">';
-        html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
+        html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
         html += '<h3 class="formDialogHeaderTitle">';
         html += title;
         html += '</h3>';
@@ -172,4 +172,4 @@ define(['shell', 'dialogHelper', 'loading', 'layoutManager', 'connectionManager'
     };
 
     return RefreshDialog;
-});
\ No newline at end of file
+});
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index e586a1e124..59bb2c5cc4 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -135,7 +135,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
             apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) {
                 var userData = fullItem.UserData || {};
                 var likes = null == userData.Likes ? "" : userData.Likes;
-                context.querySelector(".nowPlayingPageUserDataButtons").innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + fullItem.Id + '" data-serverid="' + fullItem.ServerId + '" data-itemtype="' + fullItem.Type + '" data-likes="' + likes + '" data-isfavorite="' + userData.IsFavorite + '"><i class="md-icon">&#xE87D;</i></button>';
+                context.querySelector(".nowPlayingPageUserDataButtons").innerHTML = '<button is="emby-ratingbutton" type="button" class="listItemButton paper-icon-button-light" data-id="' + fullItem.Id + '" data-serverid="' + fullItem.ServerId + '" data-itemtype="' + fullItem.Type + '" data-likes="' + likes + '" data-isfavorite="' + userData.IsFavorite + '"><i class="md-icon">favorite</i></button>';
             });
         } else {
             backdrop.clear();
@@ -179,15 +179,15 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
             if (player) {
                 switch (playbackManager.getRepeatMode(player)) {
                     case "RepeatNone":
-                    playbackManager.setRepeatMode("RepeatAll", player);
-                    break;
+                        playbackManager.setRepeatMode("RepeatAll", player);
+                        break;
 
                     case "RepeatAll":
-                    playbackManager.setRepeatMode("RepeatOne", player);
-                    break;
+                        playbackManager.setRepeatMode("RepeatOne", player);
+                        break;
 
                     case "RepeatOne":
-                    playbackManager.setRepeatMode("RepeatNone", player);
+                        playbackManager.setRepeatMode("RepeatNone", player);
                 }
             }
         }
@@ -291,10 +291,10 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
 
             if (isMuted) {
                 view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Unmute"));
-                view.querySelector(".buttonMute i").innerHTML = "&#xE04F;";
+                view.querySelector(".buttonMute i").innerHTML = "volume_off";
             } else {
                 view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Mute"));
-                view.querySelector(".buttonMute i").innerHTML = "&#xE050;";
+                view.querySelector(".buttonMute i").innerHTML = "volume_up";
             }
 
             if (progressElement) {
@@ -361,7 +361,7 @@ define(["browser", "datetime", "backdrop", "libraryBrowser", "listView", "imageL
                     action: "setplaylistindex",
                     enableUserDataButtons: false,
                     rightButtons: [{
-                        icon: "&#xE15D;",
+                        icon: "remove_circle_outline",
                         title: globalize.translate("ButtonRemove"),
                         id: "remove"
                     }],
diff --git a/src/components/sanitizefilename.js b/src/components/sanitizefilename.js
index 843ab31f04..d422a95533 100644
--- a/src/components/sanitizefilename.js
+++ b/src/components/sanitizefilename.js
@@ -34,18 +34,14 @@ define([], function () {
                 // when parsing previous hi-surrogate, 3 is added to byteLength
                 if (prevCodePoint != null && isHighSurrogate(prevCodePoint)) {
                     byteLength += 1;
-                }
-                else {
+                } else {
                     byteLength += 3;
                 }
-            }
-            else if (codePoint <= 0x7f) {
+            } else if (codePoint <= 0x7f) {
                 byteLength += 1;
-            }
-            else if (codePoint >= 0x80 && codePoint <= 0x7ff) {
+            } else if (codePoint >= 0x80 && codePoint <= 0x7ff) {
                 byteLength += 2;
-            }
-            else if (codePoint >= 0x800 && codePoint <= 0xffff) {
+            } else if (codePoint >= 0x800 && codePoint <= 0xffff) {
                 byteLength += 3;
             }
             prevCodePoint = codePoint;
@@ -77,8 +73,7 @@ define([], function () {
 
             if (curByteLength === byteLength) {
                 return string.slice(0, i + 1);
-            }
-            else if (curByteLength > byteLength) {
+            } else if (curByteLength > byteLength) {
                 return string.slice(0, i - segment.length + 1);
             }
         }
@@ -89,11 +84,11 @@ define([], function () {
     return {
         sanitize: function (input, replacement) {
             var sanitized = input
-              .replace(illegalRe, replacement)
-              .replace(controlRe, replacement)
-              .replace(reservedRe, replacement)
-              .replace(windowsReservedRe, replacement)
-              .replace(windowsTrailingRe, replacement);
+                .replace(illegalRe, replacement)
+                .replace(controlRe, replacement)
+                .replace(reservedRe, replacement)
+                .replace(windowsReservedRe, replacement)
+                .replace(windowsTrailingRe, replacement);
             return truncate(sanitized, 255);
         }
     };
diff --git a/src/components/scroller.js b/src/components/scroller.js
index de0ce6b932..65f33b8e8d 100644
--- a/src/components/scroller.js
+++ b/src/components/scroller.js
@@ -82,7 +82,7 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'sc
             intervactive: null, // Selector for special interactive elements.
 
             // Mixed options
-            speed: 0, // Animations speed in milliseconds. 0 to disable animations.
+            speed: 0 // Animations speed in milliseconds. 0 to disable animations.
 
         }, options);
 
@@ -93,17 +93,14 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'sc
         // in cases with firefox, if the smooth scroll api is supported then use that because their implementation is very good
         if (options.allowNativeScroll === false) {
             options.enableNativeScroll = false;
-        }
-        else if (isSmoothScrollSupported && ((browser.firefox && !layoutManager.tv) || options.allowNativeSmoothScroll)) {
+        } else if (isSmoothScrollSupported && ((browser.firefox && !layoutManager.tv) || options.allowNativeSmoothScroll)) {
             // native smooth scroll
             options.enableNativeScroll = true;
-        }
-        else if (options.requireAnimation && (browser.animate || browser.supportsCssAnimation())) {
+        } else if (options.requireAnimation && (browser.animate || browser.supportsCssAnimation())) {
 
             // transform is the only way to guarantee animation
             options.enableNativeScroll = false;
-        }
-        else if (!layoutManager.tv || !browser.animate) {
+        } else if (!layoutManager.tv || !browser.animate) {
 
             options.enableNativeScroll = true;
         }
@@ -211,7 +208,9 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'sc
             self.frameResizeObserver.observe(frame);
         }
 
-        self.reload = function () { load(); };
+        self.reload = function () {
+            load();
+        };
 
         self.getScrollEventName = function () {
             return transform ? 'scrollanimate' : 'scroll';
@@ -227,7 +226,6 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'sc
 
         function nativeScrollTo(container, pos, immediate) {
 
-
             if (container.scroll) {
                 if (o.horizontal) {
 
@@ -242,8 +240,7 @@ define(['browser', 'layoutManager', 'dom', 'focusManager', 'ResizeObserver', 'sc
                         behavior: immediate ? 'instant' : 'smooth'
                     });
                 }
-            }
-            else if (!immediate && container.scrollTo) {
+            } else if (!immediate && container.scrollTo) {
                 if (o.horizontal) {
                     container.scrollTo(Math.round(pos), 0);
                 } else {
diff --git a/src/components/search/searchfields.template.html b/src/components/search/searchfields.template.html
index cb6f11499a..bad808cb7e 100644
--- a/src/components/search/searchfields.template.html
+++ b/src/components/search/searchfields.template.html
@@ -1,7 +1,7 @@
 <div class="searchFieldsInner flex align-items-center justify-content-center">
-    <i class="searchfields-icon md-icon">&#xE8B6;</i>
+    <i class="searchfields-icon md-icon">search</i>
     <div class="inputContainer flex-grow" style="margin-bottom: 0;">
         <input is="emby-input" class="searchfields-txtSearch" type="text" data-keyboard="false" placeholder="${Search}" autocomplete="off" maxlength="40" autofocus />
     </div>
 </div>
-<div class="alphaPicker align-items-center hide"></div>
\ No newline at end of file
+<div class="alphaPicker align-items-center hide"></div>
diff --git a/src/components/search/searchresults.js b/src/components/search/searchresults.js
index e42088c066..d979a94693 100644
--- a/src/components/search/searchresults.js
+++ b/src/components/search/searchresults.js
@@ -56,8 +56,7 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
         if (instance.options.collectionType === 'tvshows') {
             if (query.IncludeArtists) {
                 allowSearch = false;
-            }
-            else if (queryIncludeItemTypes === 'Movie' ||
+            } else if (queryIncludeItemTypes === 'Movie' ||
                 queryIncludeItemTypes === 'LiveTvProgram' ||
                 queryIncludeItemTypes === 'MusicAlbum' ||
                 queryIncludeItemTypes === 'Audio' ||
@@ -69,12 +68,10 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
                 query.MediaTypes === 'Photo') {
                 allowSearch = false;
             }
-        }
-        else if (instance.options.collectionType === 'movies') {
+        } else if (instance.options.collectionType === 'movies') {
             if (query.IncludeArtists) {
                 allowSearch = false;
-            }
-            else if (queryIncludeItemTypes === 'Series' ||
+            } else if (queryIncludeItemTypes === 'Series' ||
                 queryIncludeItemTypes === 'Episode' ||
                 queryIncludeItemTypes === 'LiveTvProgram' ||
                 queryIncludeItemTypes === 'MusicAlbum' ||
@@ -87,23 +84,19 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
                 query.MediaTypes === 'Photo') {
                 allowSearch = false;
             }
-        }
-        else if (instance.options.collectionType === 'music') {
+        } else if (instance.options.collectionType === 'music') {
             if (query.People) {
                 allowSearch = false;
-            }
-            else if (queryIncludeItemTypes === 'Series' ||
+            } else if (queryIncludeItemTypes === 'Series' ||
                 queryIncludeItemTypes === 'Episode' ||
                 queryIncludeItemTypes === 'LiveTvProgram' ||
                 queryIncludeItemTypes === 'Movie') {
                 allowSearch = false;
             }
-        }
-        else if (instance.options.collectionType === 'livetv') {
+        } else if (instance.options.collectionType === 'livetv') {
             if (query.IncludeArtists || query.IncludePeople) {
                 allowSearch = false;
-            }
-            else if (queryIncludeItemTypes === 'Series' ||
+            } else if (queryIncludeItemTypes === 'Series' ||
                 queryIncludeItemTypes === 'Episode' ||
                 queryIncludeItemTypes === 'MusicAlbum' ||
                 queryIncludeItemTypes === 'Audio' ||
@@ -142,7 +135,7 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
                 } else if (query.IncludeArtists) {
                     methodName = 'getArtists';
-                } 
+                }
             }
 
             return apiClient[methodName](apiClient.getCurrentUserId(), query);
@@ -179,19 +172,19 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
             }, context, '.movieResults', {
 
-                    preferThumb: true,
-                    inheritThumb: false,
-                    shape: (enableScrollX() ? 'overflowPortrait' : 'portrait'),
-                    showParentTitleOrTitle: true,
-                    showTitle: false,
-                    centerText: true,
-                    coverImage: true,
-                    overlayText: false,
-                    overlayMoreButton: true,
-                    showAirTime: true,
-                    showAirDateTime: true,
-                    showChannelName: true
-                });
+                preferThumb: true,
+                inheritThumb: false,
+                shape: (enableScrollX() ? 'overflowPortrait' : 'portrait'),
+                showParentTitleOrTitle: true,
+                showTitle: false,
+                centerText: true,
+                coverImage: true,
+                overlayText: false,
+                overlayMoreButton: true,
+                showAirTime: true,
+                showAirDateTime: true,
+                showChannelName: true
+            });
         } else {
 
             searchType(instance, apiClient, {
@@ -205,11 +198,11 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
             }, context, '.movieResults', {
 
-                    showTitle: true,
-                    overlayText: false,
-                    centerText: true,
-                    showYear: true
-                });
+                showTitle: true,
+                overlayText: false,
+                centerText: true,
+                showYear: true
+            });
         }
 
         searchType(instance, apiClient, {
@@ -223,11 +216,11 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
         }, context, '.seriesResults', {
 
-                showTitle: true,
-                overlayText: false,
-                centerText: true,
-                showYear: true
-            });
+            showTitle: true,
+            overlayText: false,
+            centerText: true,
+            showYear: true
+        });
 
         if (instance.options.collectionType === 'livetv') {
 
@@ -246,19 +239,19 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
             }, context, '.episodeResults', {
 
-                    preferThumb: true,
-                    inheritThumb: false,
-                    shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
-                    showParentTitleOrTitle: true,
-                    showTitle: false,
-                    centerText: true,
-                    coverImage: true,
-                    overlayText: false,
-                    overlayMoreButton: true,
-                    showAirTime: true,
-                    showAirDateTime: true,
-                    showChannelName: true
-                });
+                preferThumb: true,
+                inheritThumb: false,
+                shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
+                showParentTitleOrTitle: true,
+                showTitle: false,
+                centerText: true,
+                coverImage: true,
+                overlayText: false,
+                overlayMoreButton: true,
+                showAirTime: true,
+                showAirDateTime: true,
+                showChannelName: true
+            });
 
         } else {
 
@@ -273,10 +266,10 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
             }, context, '.episodeResults', {
 
-                    coverImage: true,
-                    showTitle: true,
-                    showParentTitle: true
-                });
+                coverImage: true,
+                showTitle: true,
+                showParentTitle: true
+            });
         }
 
         searchType(instance, apiClient, {
@@ -292,20 +285,20 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
         }, context, '.sportsResults', {
 
-                preferThumb: true,
-                inheritThumb: false,
-                shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
-                showParentTitleOrTitle: true,
-                showTitle: false,
-                centerText: true,
-                coverImage: true,
-                overlayText: false,
-                overlayMoreButton: true,
-                showAirTime: true,
-                showAirDateTime: true,
-                showChannelName: true
+            preferThumb: true,
+            inheritThumb: false,
+            shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
+            showParentTitleOrTitle: true,
+            showTitle: false,
+            centerText: true,
+            coverImage: true,
+            overlayText: false,
+            overlayMoreButton: true,
+            showAirTime: true,
+            showAirDateTime: true,
+            showChannelName: true
 
-            });
+        });
 
         searchType(instance, apiClient, {
             searchTerm: value,
@@ -320,20 +313,20 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
         }, context, '.kidsResults', {
 
-                preferThumb: true,
-                inheritThumb: false,
-                shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
-                showParentTitleOrTitle: true,
-                showTitle: false,
-                centerText: true,
-                coverImage: true,
-                overlayText: false,
-                overlayMoreButton: true,
-                showAirTime: true,
-                showAirDateTime: true,
-                showChannelName: true
+            preferThumb: true,
+            inheritThumb: false,
+            shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
+            showParentTitleOrTitle: true,
+            showTitle: false,
+            centerText: true,
+            coverImage: true,
+            overlayText: false,
+            overlayMoreButton: true,
+            showAirTime: true,
+            showAirDateTime: true,
+            showChannelName: true
 
-            });
+        });
 
         searchType(instance, apiClient, {
             searchTerm: value,
@@ -348,20 +341,20 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
         }, context, '.newsResults', {
 
-                preferThumb: true,
-                inheritThumb: false,
-                shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
-                showParentTitleOrTitle: true,
-                showTitle: false,
-                centerText: true,
-                coverImage: true,
-                overlayText: false,
-                overlayMoreButton: true,
-                showAirTime: true,
-                showAirDateTime: true,
-                showChannelName: true
+            preferThumb: true,
+            inheritThumb: false,
+            shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
+            showParentTitleOrTitle: true,
+            showTitle: false,
+            centerText: true,
+            coverImage: true,
+            overlayText: false,
+            overlayMoreButton: true,
+            showAirTime: true,
+            showAirDateTime: true,
+            showChannelName: true
 
-            });
+        });
 
         searchType(instance, apiClient, {
             searchTerm: value,
@@ -379,20 +372,20 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
         }, context, '.programResults', {
 
-                preferThumb: true,
-                inheritThumb: false,
-                shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
-                showParentTitleOrTitle: true,
-                showTitle: false,
-                centerText: true,
-                coverImage: true,
-                overlayText: false,
-                overlayMoreButton: true,
-                showAirTime: true,
-                showAirDateTime: true,
-                showChannelName: true
+            preferThumb: true,
+            inheritThumb: false,
+            shape: (enableScrollX() ? 'overflowBackdrop' : 'backdrop'),
+            showParentTitleOrTitle: true,
+            showTitle: false,
+            centerText: true,
+            coverImage: true,
+            overlayText: false,
+            overlayMoreButton: true,
+            showAirTime: true,
+            showAirDateTime: true,
+            showChannelName: true
 
-            });
+        });
 
         searchType(instance, apiClient, {
             searchTerm: value,
@@ -406,11 +399,11 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
         }, context, '.videoResults', {
 
-                showParentTitle: true,
-                showTitle: true,
-                overlayText: false,
-                centerText: true
-            });
+            showParentTitle: true,
+            showTitle: true,
+            overlayText: false,
+            centerText: true
+        });
 
         searchType(instance, apiClient, {
             searchTerm: value,
@@ -422,9 +415,9 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
         }, context, '.peopleResults', {
 
-                coverImage: true,
-                showTitle: true
-            });
+            coverImage: true,
+            showTitle: true
+        });
 
         searchType(instance, apiClient, {
             searchTerm: value,
@@ -435,9 +428,9 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
             IncludeArtists: true
 
         }, context, '.artistResults', {
-                coverImage: true,
-                showTitle: true
-            });
+            coverImage: true,
+            showTitle: true
+        });
 
         searchType(instance, apiClient, {
             searchTerm: value,
@@ -450,11 +443,11 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
         }, context, '.albumResults', {
 
-                showParentTitle: true,
-                showTitle: true,
-                overlayText: false,
-                centerText: true
-            });
+            showParentTitle: true,
+            showTitle: true,
+            overlayText: false,
+            centerText: true
+        });
 
         searchType(instance, apiClient, {
             searchTerm: value,
@@ -467,13 +460,13 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
         }, context, '.songResults', {
 
-                showParentTitle: true,
-                showTitle: true,
-                overlayText: false,
-                centerText: true,
-                action: 'play'
+            showParentTitle: true,
+            showTitle: true,
+            overlayText: false,
+            centerText: true,
+            action: 'play'
 
-            });
+        });
 
         searchType(instance, apiClient, {
             searchTerm: value,
@@ -486,11 +479,11 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
         }, context, '.photoResults', {
 
-                showParentTitle: false,
-                showTitle: true,
-                overlayText: false,
-                centerText: true
-            });
+            showParentTitle: false,
+            showTitle: true,
+            overlayText: false,
+            centerText: true
+        });
 
         searchType(instance, apiClient, {
             searchTerm: value,
@@ -503,10 +496,10 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
         }, context, '.photoAlbumResults', {
 
-                showTitle: true,
-                overlayText: false,
-                centerText: true
-            });
+            showTitle: true,
+            overlayText: false,
+            centerText: true
+        });
 
         searchType(instance, apiClient, {
             searchTerm: value,
@@ -519,11 +512,11 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
         }, context, '.bookResults', {
 
-                showTitle: true,
-                overlayText: false,
-                centerText: true
+            showTitle: true,
+            overlayText: false,
+            centerText: true
 
-            });
+        });
 
         searchType(instance, apiClient, {
             searchTerm: value,
@@ -536,10 +529,10 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
         }, context, '.audioBookResults', {
 
-                showTitle: true,
-                overlayText: false,
-                centerText: true
-            });
+            showTitle: true,
+            overlayText: false,
+            centerText: true
+        });
 
         searchType(instance, apiClient, {
             searchTerm: value,
@@ -552,10 +545,10 @@ define(['layoutManager', 'globalize', 'require', 'events', 'connectionManager',
 
         }, context, '.playlistResults', {
 
-                showTitle: true,
-                overlayText: false,
-                centerText: true
-            });
+            showTitle: true,
+            overlayText: false,
+            centerText: true
+        });
     }
 
     function searchType(instance, apiClient, query, context, section, cardOptions) {
diff --git a/src/components/serverNotifications/gamepadtokey.js b/src/components/serverNotifications/gamepadtokey.js
index 5dafb2828b..abf3ddb38b 100644
--- a/src/components/serverNotifications/gamepadtokey.js
+++ b/src/components/serverNotifications/gamepadtokey.js
@@ -22,44 +22,44 @@
 require(['apphost'], function (appHost) {
     "use strict";
 
-    var _GAMEPAD_A_BUTTON_INDEX = 0,
-    _GAMEPAD_B_BUTTON_INDEX = 1,
-    _GAMEPAD_DPAD_UP_BUTTON_INDEX = 12,
-    _GAMEPAD_DPAD_DOWN_BUTTON_INDEX = 13,
-    _GAMEPAD_DPAD_LEFT_BUTTON_INDEX = 14,
-    _GAMEPAD_DPAD_RIGHT_BUTTON_INDEX = 15,
-    _GAMEPAD_A_KEY = "GamepadA",
-    _GAMEPAD_B_KEY = "GamepadB",
-    _GAMEPAD_DPAD_UP_KEY = "GamepadDPadUp",
-    _GAMEPAD_DPAD_DOWN_KEY = "GamepadDPadDown",
-    _GAMEPAD_DPAD_LEFT_KEY = "GamepadDPadLeft",
-    _GAMEPAD_DPAD_RIGHT_KEY = "GamepadDPadRight",
-    _GAMEPAD_LEFT_THUMBSTICK_UP_KEY = "GamepadLeftThumbStickUp",
-    _GAMEPAD_LEFT_THUMBSTICK_DOWN_KEY = "GamepadLeftThumbStickDown",
-    _GAMEPAD_LEFT_THUMBSTICK_LEFT_KEY = "GamepadLeftThumbStickLeft",
-    _GAMEPAD_LEFT_THUMBSTICK_RIGHT_KEY = "GamepadLeftThumbStickRight",
-    _GAMEPAD_A_KEYCODE = 0,
-    _GAMEPAD_B_KEYCODE = 27,
-    _GAMEPAD_DPAD_UP_KEYCODE = 38,
-    _GAMEPAD_DPAD_DOWN_KEYCODE = 40,
-    _GAMEPAD_DPAD_LEFT_KEYCODE = 37,
-    _GAMEPAD_DPAD_RIGHT_KEYCODE = 39,
-    _GAMEPAD_LEFT_THUMBSTICK_UP_KEYCODE = 38,
-    _GAMEPAD_LEFT_THUMBSTICK_DOWN_KEYCODE = 40,
-    _GAMEPAD_LEFT_THUMBSTICK_LEFT_KEYCODE = 37,
-    _GAMEPAD_LEFT_THUMBSTICK_RIGHT_KEYCODE = 39,
-    _THUMB_STICK_THRESHOLD = 0.75;
+    var _GAMEPAD_A_BUTTON_INDEX = 0;
+    var _GAMEPAD_B_BUTTON_INDEX = 1;
+    var _GAMEPAD_DPAD_UP_BUTTON_INDEX = 12;
+    var _GAMEPAD_DPAD_DOWN_BUTTON_INDEX = 13;
+    var _GAMEPAD_DPAD_LEFT_BUTTON_INDEX = 14;
+    var _GAMEPAD_DPAD_RIGHT_BUTTON_INDEX = 15;
+    var _GAMEPAD_A_KEY = "GamepadA";
+    var _GAMEPAD_B_KEY = "GamepadB";
+    var _GAMEPAD_DPAD_UP_KEY = "GamepadDPadUp";
+    var _GAMEPAD_DPAD_DOWN_KEY = "GamepadDPadDown";
+    var _GAMEPAD_DPAD_LEFT_KEY = "GamepadDPadLeft";
+    var _GAMEPAD_DPAD_RIGHT_KEY = "GamepadDPadRight";
+    var _GAMEPAD_LEFT_THUMBSTICK_UP_KEY = "GamepadLeftThumbStickUp";
+    var _GAMEPAD_LEFT_THUMBSTICK_DOWN_KEY = "GamepadLeftThumbStickDown";
+    var _GAMEPAD_LEFT_THUMBSTICK_LEFT_KEY = "GamepadLeftThumbStickLeft";
+    var _GAMEPAD_LEFT_THUMBSTICK_RIGHT_KEY = "GamepadLeftThumbStickRight";
+    var _GAMEPAD_A_KEYCODE = 0;
+    var _GAMEPAD_B_KEYCODE = 27;
+    var _GAMEPAD_DPAD_UP_KEYCODE = 38;
+    var _GAMEPAD_DPAD_DOWN_KEYCODE = 40;
+    var _GAMEPAD_DPAD_LEFT_KEYCODE = 37;
+    var _GAMEPAD_DPAD_RIGHT_KEYCODE = 39;
+    var _GAMEPAD_LEFT_THUMBSTICK_UP_KEYCODE = 38;
+    var _GAMEPAD_LEFT_THUMBSTICK_DOWN_KEYCODE = 40;
+    var _GAMEPAD_LEFT_THUMBSTICK_LEFT_KEYCODE = 37;
+    var _GAMEPAD_LEFT_THUMBSTICK_RIGHT_KEYCODE = 39;
+    var _THUMB_STICK_THRESHOLD = 0.75;
 
-    var _leftThumbstickUpPressed = false,
-    _leftThumbstickDownPressed = false,
-    _leftThumbstickLeftPressed = false,
-    _leftThumbstickRightPressed = false,
-    _dPadUpPressed = false,
-    _dPadDownPressed = false,
-    _dPadLeftPressed = false,
-    _dPadRightPressed = false,
-    _gamepadAPressed = false,
-    _gamepadBPressed = false;
+    var _leftThumbstickUpPressed = false;
+    var _leftThumbstickDownPressed = false;
+    var _leftThumbstickLeftPressed = false;
+    var _leftThumbstickRightPressed = false;
+    var _dPadUpPressed = false;
+    var _dPadDownPressed = false;
+    var _dPadLeftPressed = false;
+    var _dPadRightPressed = false;
+    var _gamepadAPressed = false;
+    var _gamepadBPressed = false;
 
     // The set of buttons on the gamepad we listen for.
     var ProcessedButtons = [
@@ -260,7 +260,9 @@ require(['apphost'], function (appHost) {
             gamepads = navigator.webkitGetGamepads();
         }
         gamepads = gamepads || [];
-        var i, j, len;
+        var i;
+        var j;
+        var len;
         for (i = 0, len = gamepads.length; i < len; i++) {
             var gamepad = gamepads[i];
             if (gamepad) {
diff --git a/src/components/serverNotifications/serverNotifications.js b/src/components/serverNotifications/serverNotifications.js
index 74c65cd473..ff571b1e1a 100644
--- a/src/components/serverNotifications/serverNotifications.js
+++ b/src/components/serverNotifications/serverNotifications.js
@@ -18,8 +18,7 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
                 toast({ title: args.Header, text: args.Text });
             });
 
-        }
-        else {
+        } else {
             require(['alert'], function (alert) {
                 alert({ title: args.Header, text: args.Text });
             });
@@ -157,11 +156,9 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
 
             if (msg.Data.PlayCommand === "PlayNext") {
                 playbackManager.queueNext({ ids: msg.Data.ItemIds, serverId: serverId });
-            }
-            else if (msg.Data.PlayCommand === "PlayLast") {
+            } else if (msg.Data.PlayCommand === "PlayLast") {
                 playbackManager.queue({ ids: msg.Data.ItemIds, serverId: serverId });
-            }
-            else {
+            } else {
                 playbackManager.play({
                     ids: msg.Data.ItemIds,
                     startPositionTicks: msg.Data.StartPositionTicks,
@@ -173,38 +170,29 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
                 });
             }
 
-        }
-        else if (msg.MessageType === "Playstate") {
+        } else if (msg.MessageType === "Playstate") {
 
             if (msg.Data.Command === 'Stop') {
                 inputManager.trigger('stop');
-            }
-            else if (msg.Data.Command === 'Pause') {
+            } else if (msg.Data.Command === 'Pause') {
                 inputManager.trigger('pause');
-            }
-            else if (msg.Data.Command === 'Unpause') {
+            } else if (msg.Data.Command === 'Unpause') {
                 inputManager.trigger('play');
-            }
-            else if (msg.Data.Command === 'PlayPause') {
+            } else if (msg.Data.Command === 'PlayPause') {
                 inputManager.trigger('playpause');
-            }
-            else if (msg.Data.Command === 'Seek') {
+            } else if (msg.Data.Command === 'Seek') {
                 playbackManager.seek(msg.Data.SeekPositionTicks);
-            }
-            else if (msg.Data.Command === 'NextTrack') {
+            } else if (msg.Data.Command === 'NextTrack') {
                 inputManager.trigger('next');
-            }
-            else if (msg.Data.Command === 'PreviousTrack') {
+            } else if (msg.Data.Command === 'PreviousTrack') {
                 inputManager.trigger('previous');
             } else {
                 notifyApp();
             }
-        }
-        else if (msg.MessageType === "GeneralCommand") {
+        } else if (msg.MessageType === "GeneralCommand") {
             var cmd = msg.Data;
             processGeneralCommand(cmd, apiClient);
-        }
-        else if (msg.MessageType === "UserDataChanged") {
+        } else if (msg.MessageType === "UserDataChanged") {
 
             if (msg.Data.UserId === apiClient.getCurrentUserId()) {
 
@@ -212,8 +200,7 @@ define(['connectionManager', 'playbackManager', 'events', 'inputManager', 'focus
                     events.trigger(serverNotifications, 'UserDataChanged', [apiClient, msg.Data.UserDataList[i]]);
                 }
             }
-        }
-        else {
+        } else {
 
             events.trigger(serverNotifications, msg.MessageType, [apiClient, msg.Data]);
         }
diff --git a/src/components/serverRestartDialog.js b/src/components/serverRestartDialog.js
index 6c7e5b7386..4c20183b2a 100644
--- a/src/components/serverRestartDialog.js
+++ b/src/components/serverRestartDialog.js
@@ -6,9 +6,7 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
     var currentInstance;
 
     function reloadPageWhenServerAvailable(retryCount) {
-
         var apiClient = currentApiClient;
-
         if (!apiClient) {
             return;
         }
@@ -31,7 +29,6 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
 
     function retryReload(retryCount) {
         setTimeout(function () {
-
             retryCount = retryCount || 0;
             retryCount++;
 
@@ -42,15 +39,12 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
     }
 
     function startRestart(instance, apiClient, dlg) {
-
         currentApiClient = apiClient;
         currentDlg = dlg;
         currentInstance = instance;
 
         apiClient.restartServer().then(function () {
-
             setTimeout(reloadPageWhenServerAvailable, 250);
-
         });
     }
 
@@ -94,7 +88,8 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
 
         dlg.querySelector('.text').innerHTML = globalize.translate('RestartPleaseWaitMessage');
 
-        var i, length;
+        var i;
+        var length;
         var html = '';
         for (i = 0, length = configuredButtons.length; i < length; i++) {
             var item = configuredButtons[i];
@@ -138,12 +133,10 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
     }
 
     function ServerRestartDialog(options) {
-
         this.options = options;
     }
 
     ServerRestartDialog.prototype.show = function () {
-
         var instance = this;
         loading.show();
 
@@ -155,7 +148,6 @@ define(['loading', 'events', 'dialogHelper', 'dom', 'layoutManager', 'scrollHelp
     };
 
     ServerRestartDialog.prototype.destroy = function () {
-
         currentApiClient = null;
         currentDlg = null;
         currentInstance = null;
diff --git a/src/components/shell.js b/src/components/shell.js
index 762039ac42..534a57b027 100644
--- a/src/components/shell.js
+++ b/src/components/shell.js
@@ -8,7 +8,7 @@ define([], function () {
             } else {
                 window.open(url, target || '_blank');
             }
-            
+
         },
         canExec: false,
         exec: function (options) {
diff --git a/src/components/shortcuts.js b/src/components/shortcuts.js
index f6c1e97893..9d2b1847e5 100644
--- a/src/components/shortcuts.js
+++ b/src/components/shortcuts.js
@@ -128,8 +128,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
 
                         if (result.command === 'playallfromhere' || result.command === 'queueallfromhere') {
                             executeAction(card, options.positionTo, result.command);
-                        }
-                        else if (result.updated || result.deleted) {
+                        } else if (result.updated || result.deleted) {
                             notifyRefreshNeeded(card, options.itemsContainer);
                         }
                     });
@@ -204,21 +203,15 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
                 context: card.getAttribute('data-context'),
                 parentId: card.getAttribute('data-parentid')
             });
-        }
-
-        else if (action === 'programdialog') {
+        } else if (action === 'programdialog') {
 
             showProgramDialog(item);
-        }
-
-        else if (action === 'instantmix') {
+        } else if (action === 'instantmix') {
             playbackManager.instantMix({
                 Id: playableItemId,
                 ServerId: serverId
             });
-        }
-
-        else if (action === 'play' || action === 'resume') {
+        } else if (action === 'play' || action === 'resume') {
 
             var startPositionTicks = parseInt(card.getAttribute('data-positionticks') || '0');
 
@@ -227,9 +220,7 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
                 startPositionTicks: startPositionTicks,
                 serverId: serverId
             });
-        }
-
-        else if (action === 'queue') {
+        } else if (action === 'queue') {
 
             if (playbackManager.isPlaying()) {
                 playbackManager.queue({
@@ -243,25 +234,15 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
                     serverId: serverId
                 });
             }
-        }
-
-        else if (action === 'playallfromhere') {
+        } else if (action === 'playallfromhere') {
             playAllFromHere(card, serverId);
-        }
-
-        else if (action === 'queueallfromhere') {
+        } else if (action === 'queueallfromhere') {
             playAllFromHere(card, serverId, true);
-        }
-
-        else if (action === 'setplaylistindex') {
+        } else if (action === 'setplaylistindex') {
             playbackManager.setCurrentPlaylistItem(card.getAttribute('data-playlistitemid'));
-        }
-
-        else if (action === 'record') {
+        } else if (action === 'record') {
             onRecordCommand(serverId, id, type, card.getAttribute('data-timerid'), card.getAttribute('data-seriestimerid'));
-        }
-
-        else if (action === 'menu') {
+        } else if (action === 'menu') {
 
             var options = target.getAttribute('data-playoptions') === 'false' ?
                 {
@@ -277,27 +258,17 @@ define(['playbackManager', 'inputManager', 'connectionManager', 'appRouter', 'gl
             options.positionTo = target;
 
             showContextMenu(card, options);
-        }
-
-        else if (action === 'playmenu') {
+        } else if (action === 'playmenu') {
             showPlayMenu(card, target);
-        }
-
-        else if (action === 'edit') {
+        } else if (action === 'edit') {
             getItem(target).then(function (item) {
                 editItem(item, serverId);
             });
-        }
-
-        else if (action === 'playtrailer') {
+        } else if (action === 'playtrailer') {
             getItem(target).then(playTrailer);
-        }
-
-        else if (action === 'addtoplaylist') {
+        } else if (action === 'addtoplaylist') {
             getItem(target).then(addToPlaylist);
-        }
-
-        else if (action === 'custom') {
+        } else if (action === 'custom') {
 
             var customAction = target.getAttribute('data-customaction');
 
diff --git a/src/components/skinManager.js b/src/components/skinManager.js
index 780b8273bb..9f96516422 100644
--- a/src/components/skinManager.js
+++ b/src/components/skinManager.js
@@ -20,7 +20,7 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
         } else {
             Emby.Page.goHome();
         }
-    };
+    }
 
     function getThemes() {
         return [{
@@ -36,7 +36,7 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
             isDefaultServerDashboard: true
         }, {
             name: "Emby",
-            id: "emby",
+            id: "emby"
         }, {
             name: "Light",
             id: "light"
@@ -47,7 +47,7 @@ define(['apphost', 'userSettings', 'browser', 'events', 'pluginManager', 'backdr
             name: "Windows Media Center",
             id: "wmc"
         }];
-    };
+    }
 
     var skinManager = {
         getThemes: getThemes,
diff --git a/src/components/slideshow/slideshow.js b/src/components/slideshow/slideshow.js
index 6bb485a616..a5acd042b3 100644
--- a/src/components/slideshow/slideshow.js
+++ b/src/components/slideshow/slideshow.js
@@ -77,8 +77,7 @@ define(['dialogHelper', 'inputManager', 'connectionManager', 'layoutManager', 'f
 
         try {
             appHost.setUserScalable(scalable);
-        }
-        catch (err) {
+        } catch (err) {
             console.log('error in appHost.setUserScalable: ' + err);
         }
     }
diff --git a/src/components/sortmenu/sortmenu.js b/src/components/sortmenu/sortmenu.js
index da2fcdaa7c..d4f75a0806 100644
--- a/src/components/sortmenu/sortmenu.js
+++ b/src/components/sortmenu/sortmenu.js
@@ -66,7 +66,7 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'layoutMana
                 var html = '';
 
                 html += '<div class="formDialogHeader">';
-                html += '<button is="paper-icon-button-light" class="btnCancel hide-mouse-idle-tv" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
+                html += '<button is="paper-icon-button-light" class="btnCancel hide-mouse-idle-tv" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
                 html += '<h3 class="formDialogHeaderTitle">${Sort}</h3>';
 
                 html += '</div>';
@@ -121,4 +121,4 @@ define(['require', 'dom', 'focusManager', 'dialogHelper', 'loading', 'layoutMana
     };
 
     return SortMenu;
-});
\ No newline at end of file
+});
diff --git a/src/components/subtitleeditor/subtitleeditor.js b/src/components/subtitleeditor/subtitleeditor.js
index 27055f5976..964aa81789 100644
--- a/src/components/subtitleeditor/subtitleeditor.js
+++ b/src/components/subtitleeditor/subtitleeditor.js
@@ -192,8 +192,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
         var lastLanguage = userSettings.get('subtitleeditor-language');
         if (lastLanguage) {
             selectLanguage.value = lastLanguage;
-        }
-        else {
+        } else {
 
             apiClient.getCurrentUser().then(function (user) {
 
@@ -282,7 +281,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
             html += '</div>';
 
             if (!layoutManager.tv) {
-                html += '<button type="button" is="paper-icon-button-light" data-subid="' + result.Id + '" class="btnDownload listItemButton"><i class="md-icon">&#xE2C4;</i></button>';
+                html += '<button type="button" is="paper-icon-button-light" data-subid="' + result.Id + '" class="btnDownload listItemButton"><i class="md-icon">file_download</i></button>';
             }
 
             html += '</' + tagName + '>';
@@ -347,8 +346,7 @@ define(['dialogHelper', 'require', 'layoutManager', 'globalize', 'userSettings',
 
         if (typeof itemId === 'string') {
             apiClient.getItem(apiClient.getCurrentUserId(), itemId).then(onGetItem);
-        }
-        else {
+        } else {
             onGetItem(itemId);
         }
     }
diff --git a/src/components/subtitleeditor/subtitleeditor.template.html b/src/components/subtitleeditor/subtitleeditor.template.html
index 7891564449..dc8ae25701 100644
--- a/src/components/subtitleeditor/subtitleeditor.template.html
+++ b/src/components/subtitleeditor/subtitleeditor.template.html
@@ -1,8 +1,8 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>
     <h3 class="formDialogHeaderTitle">${Subtitles}</h3>
 
-    <a is="emby-linkbutton" data-autohide="true" class="button-link btnHelp flex align-items-center" href="https://docs.jellyfin.org/general/server/media/subtitles.html" target="_blank" style="margin-left:auto;margin-right:.5em;padding:.25em;" title="${Help}"><i class="md-icon">&#xE88E;</i><span style="margin-left:.25em;">${Help}</span></a>
+    <a is="emby-linkbutton" data-autohide="true" class="button-link btnHelp flex align-items-center" href="https://docs.jellyfin.org/general/server/media/subtitles.html" target="_blank" style="margin-left:auto;margin-right:.5em;padding:.25em;" title="${Help}"><i class="md-icon">info</i><span style="margin-left:.25em;">${Help}</span></a>
 
 </div>
 <div class="formDialogContent smoothScrollY">
@@ -28,4 +28,4 @@
             ${NoSubtitleSearchResultsFound}
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/components/subtitlesettings/subtitleappearancehelper.js b/src/components/subtitlesettings/subtitleappearancehelper.js
index 588f491a67..8a40bd134b 100644
--- a/src/components/subtitlesettings/subtitleappearancehelper.js
+++ b/src/components/subtitlesettings/subtitleappearancehelper.js
@@ -33,7 +33,7 @@ define([], function () {
                 case 'smaller':
                     list.push({ name: 'font-size', value: '.8em' });
                     break;
-               case 'small':
+                case 'small':
                     list.push({ name: 'font-size', value: 'inherit' });
                     break;
                 case 'larger':
@@ -132,7 +132,6 @@ define([], function () {
 
     function applyStyleList(styles, elem) {
 
-
         for (var i = 0, length = styles.length; i < length; i++) {
 
             var style = styles[i];
diff --git a/src/components/subtitlesync/subtitlesync.js b/src/components/subtitlesync/subtitlesync.js
index 3389b7bf89..904c612317 100644
--- a/src/components/subtitlesync/subtitlesync.js
+++ b/src/components/subtitlesync/subtitlesync.js
@@ -25,10 +25,10 @@ define(['playbackManager', 'text!./subtitlesync.template.html', 'css!./subtitles
 
         subtitleSyncTextField.addEventListener("keypress", function(event) {
 
-            if(event.key === "Enter"){
+            if (event.key === "Enter") {
                 // if input key is enter search for float pattern
                 var inputOffset = /[-+]?\d+\.?\d*/g.exec(this.textContent);
-                if(inputOffset) {
+                if (inputOffset) {
                     inputOffset = inputOffset[0];
 
                     // replace current text by considered offset
@@ -48,7 +48,7 @@ define(['playbackManager', 'text!./subtitlesync.template.html', 'css!./subtitles
             } else {
                 // keep focus to prevent fade with bottom layout
                 this.hasFocus = true;
-                if(event.key.match(/[+-\d.s]/) === null) {
+                if (event.key.match(/[+-\d.s]/) === null) {
                     event.preventDefault();
                 }
             }
@@ -92,14 +92,13 @@ define(['playbackManager', 'text!./subtitlesync.template.html', 'css!./subtitles
         instance.element = parent;
     }
 
-
     function getOffsetFromPercentage(value) {
         // convert percent to fraction
         var offset = (value - 50) / 50;
         // multiply by offset min/max range value (-x to +x) :
         offset *= 30;
         return offset.toFixed(1);
-    };
+    }
 
     function getPercentageFromOffset(value) {
         // divide by offset min/max range value (-x to +x) :
@@ -108,16 +107,16 @@ define(['playbackManager', 'text!./subtitlesync.template.html', 'css!./subtitles
         percentValue *= 50;
         percentValue += 50;
         return Math.min(100, Math.max(0, percentValue.toFixed()));
-    };
+    }
 
     function SubtitleSync(currentPlayer) {
         player = currentPlayer;
         init(this);
     }
 
-    SubtitleSync.prototype.destroy = function(){
+    SubtitleSync.prototype.destroy = function() {
         SubtitleSync.prototype.toggle("forceToHide");
-        if(player){
+        if (player) {
             playbackManager.disableShowingSubtitleOffset(player);
             playbackManager.setSubtitleOffset(0, player);
         }
@@ -130,27 +129,30 @@ define(['playbackManager', 'text!./subtitlesync.template.html', 'css!./subtitles
 
     SubtitleSync.prototype.toggle = function(action) {
 
-        if(player && playbackManager.supportSubtitleOffset(player)){
+        if (player && playbackManager.supportSubtitleOffset(player)) {
 
-            switch(action) {
+            switch (action) {
                 case undefined:
                     // if showing subtitle sync is enabled
-                    if(playbackManager.isShowingSubtitleOffsetEnabled(player) && 
+                    if (playbackManager.isShowingSubtitleOffsetEnabled(player) &&
                         // if there is an external subtitle stream enabled
-                        playbackManager.canHandleOffsetOnCurrentSubtitle(player)){
-                            // if no subtitle offset is defined
-                            if(!playbackManager.getPlayerSubtitleOffset(player)) {
-                                // set default offset to '0' = 50%
-                                subtitleSyncSlider.value = "50";
-                                subtitleSyncTextField.textContent = "0s";
-                                playbackManager.setSubtitleOffset(0, player);
-                            }
-                            // show subtitle sync
-                            subtitleSyncContainer.classList.remove("hide");
-                            break; // stop here
+                        playbackManager.canHandleOffsetOnCurrentSubtitle(player)) {
+                        // if no subtitle offset is defined
+                        if (!playbackManager.getPlayerSubtitleOffset(player)) {
+                            // set default offset to '0' = 50%
+                            subtitleSyncSlider.value = "50";
+                            subtitleSyncTextField.textContent = "0s";
+                            playbackManager.setSubtitleOffset(0, player);
+                        }
+                        // show subtitle sync
+                        subtitleSyncContainer.classList.remove("hide");
+                        break; // stop here
                     } // else continue and hide
                 case "hide":
-                    if(subtitleSyncTextField.hasFocus){break;} // else continue and hide
+                    // only break if element has focus
+                    if (subtitleSyncTextField.hasFocus) {
+                        break;
+                    }
                 case "forceToHide":
                     subtitleSyncContainer.classList.add("hide");
                     break;
diff --git a/src/components/tabbedview/itemstab.js b/src/components/tabbedview/itemstab.js
index ec874c69e9..33eddb6ec5 100644
--- a/src/components/tabbedview/itemstab.js
+++ b/src/components/tabbedview/itemstab.js
@@ -188,7 +188,7 @@ define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts
             return;
         }
 
-        btnSortIcon.innerHTML = values.sortOrder === 'Descending' ? '&#xE5DB;' : '&#xE5D8;';
+        btnSortIcon.innerHTML = values.sortOrder === 'Descending' ? 'arrow_downward' : 'arrow_upward';
     }
 
     function bindAll(elems, eventName, fn) {
@@ -246,7 +246,8 @@ define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts
             this.itemsContainer.setAttribute('data-parentid', params.parentId);
         }
 
-        var i, length;
+        var i;
+        var length;
 
         var btnViewSettings = view.querySelectorAll('.btnViewSettings');
         for (i = 0, length = btnViewSettings.length; i < length; i++) {
@@ -559,7 +560,6 @@ define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts
     };
 
     ItemsTab.prototype.onPause = function () {
-
         var scroller = this.scroller;
         if (scroller && scroller.pause) {
             scroller.pause();
@@ -573,7 +573,6 @@ define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts
     };
 
     ItemsTab.prototype.destroy = function () {
-
         this.view = null;
         this.itemsContainer = null;
         this.params = null;
@@ -585,6 +584,7 @@ define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts
             this.alphaPicker.destroy();
             this.alphaPicker = null;
         }
+
         this.sortButtons = null;
         this.btnSortText = null;
         this.btnSortIcon = null;
@@ -592,4 +592,4 @@ define(['playbackManager', 'userSettings', 'alphaPicker', 'alphaNumericShortcuts
     };
 
     return ItemsTab;
-});
\ No newline at end of file
+});
diff --git a/src/components/tabbedview/tabbedview.js b/src/components/tabbedview/tabbedview.js
index bc656bc3e2..33f1c6e6cc 100644
--- a/src/components/tabbedview/tabbedview.js
+++ b/src/components/tabbedview/tabbedview.js
@@ -101,8 +101,7 @@ define(['backdrop', 'mainTabsManager', 'layoutManager', 'emby-tabs'], function (
 
         if (!currentTabController) {
             mainTabsManager.selectedTabIndex(this.initialTabIndex);
-        }
-        else if (currentTabController && currentTabController.onResume) {
+        } else if (currentTabController && currentTabController.onResume) {
             currentTabController.onResume({});
         }
     };
diff --git a/src/components/thememediaplayer.js b/src/components/thememediaplayer.js
index 732cbb1cb0..a8298fad37 100644
--- a/src/components/thememediaplayer.js
+++ b/src/components/thememediaplayer.js
@@ -94,8 +94,7 @@ define(['playbackManager', 'userSettings', 'connectionManager'], function (playb
 
         if (viewOptions.supportsThemeMedia) {
             // Do nothing here, allow it to keep playing
-        }
-        else {
+        } else {
             playThemeMedia([], null);
         }
 
diff --git a/src/components/touchhelper.js b/src/components/touchhelper.js
index 66d115046b..0f6d34aace 100644
--- a/src/components/touchhelper.js
+++ b/src/components/touchhelper.js
@@ -78,11 +78,9 @@ define(['dom', 'events'], function (dom, events) {
 
                 if (deltaX > swipeXThreshold && Math.abs(deltaY) < swipeXMaxY) {
                     events.trigger(self, 'swiperight', [touchTarget]);
-                }
-                else if (deltaX < (0 - swipeXThreshold) && Math.abs(deltaY) < swipeXMaxY) {
+                } else if (deltaX < (0 - swipeXThreshold) && Math.abs(deltaY) < swipeXMaxY) {
                     events.trigger(self, 'swipeleft', [touchTarget]);
-                }
-                else if ((deltaY < (0 - swipeYThreshold) || thresholdYMet) && Math.abs(deltaX) < swipeXMaxY) {
+                } else if ((deltaY < (0 - swipeYThreshold) || thresholdYMet) && Math.abs(deltaX) < swipeXMaxY) {
 
                     thresholdYMet = true;
 
@@ -94,8 +92,7 @@ define(['dom', 'events'], function (dom, events) {
                         currentDeltaX: currentDeltaX,
                         currentDeltaY: currentDeltaY
                     }]);
-                }
-                else if ((deltaY > swipeYThreshold || thresholdYMet) && Math.abs(deltaX) < swipeXMaxY) {
+                } else if ((deltaY > swipeYThreshold || thresholdYMet) && Math.abs(deltaX) < swipeXMaxY) {
                     thresholdYMet = true;
 
                     events.trigger(self, 'swipedown', [touchTarget, {
diff --git a/src/components/tunerpicker.js b/src/components/tunerpicker.js
index 96bfc71dff..3882f2e85a 100644
--- a/src/components/tunerpicker.js
+++ b/src/components/tunerpicker.js
@@ -128,7 +128,7 @@ define(["dialogHelper", "dom", "layoutManager", "connectionManager", "globalize"
             dlg.classList.add("formDialog");
             var html = "";
             html += '<div class="formDialogHeader">';
-            html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
+            html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
             html += '<h3 class="formDialogHeaderTitle">';
             html += globalize.translate("HeaderLiveTvTunerSetup");
             html += "</h3>";
diff --git a/src/components/userdatabuttons/emby-ratingbutton.js b/src/components/userdatabuttons/emby-ratingbutton.js
index 40cf033cd5..84ae780de5 100644
--- a/src/components/userdatabuttons/emby-ratingbutton.js
+++ b/src/components/userdatabuttons/emby-ratingbutton.js
@@ -33,8 +33,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
         var isFavorite = this.getAttribute('data-isfavorite') === 'true';
         if (likes === 'true') {
             likes = true;
-        }
-        else if (likes === 'false') {
+        } else if (likes === 'false') {
             likes = false;
         } else {
             likes = null;
@@ -63,8 +62,8 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
         if (isFavorite) {
 
             if (icon) {
-                icon.innerHTML = '&#xE87D;';
-				icon.classList.add('ratingbutton-icon-withrating');
+                icon.innerHTML = 'favorite';
+                icon.classList.add('ratingbutton-icon-withrating');
             }
 
             button.classList.add('ratingbutton-withrating');
@@ -72,27 +71,27 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
         } else if (likes) {
 
             if (icon) {
-                icon.innerHTML = '&#xE87D;';
-				icon.classList.remove('ratingbutton-icon-withrating');
-                //icon.innerHTML = '&#xE8DC;';
+                icon.innerHTML = 'favorite';
+                icon.classList.remove('ratingbutton-icon-withrating');
+                //icon.innerHTML = 'thumb_up';
             }
             button.classList.remove('ratingbutton-withrating');
 
         } else if (likes === false) {
 
             if (icon) {
-                icon.innerHTML = '&#xE87D;';
-				icon.classList.remove('ratingbutton-icon-withrating');
-                //icon.innerHTML = '&#xE8DB;';
+                icon.innerHTML = 'favorite';
+                icon.classList.remove('ratingbutton-icon-withrating');
+                //icon.innerHTML = 'thumb_down';
             }
             button.classList.remove('ratingbutton-withrating');
 
         } else {
 
             if (icon) {
-                icon.innerHTML = '&#xE87D;';
-				icon.classList.remove('ratingbutton-icon-withrating');
-                //icon.innerHTML = '&#xE8DD;';
+                icon.innerHTML = 'favorite';
+                icon.classList.remove('ratingbutton-icon-withrating');
+                //icon.innerHTML = 'thumbs_up_down';
             }
             button.classList.remove('ratingbutton-withrating');
         }
@@ -152,8 +151,7 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
             var isFavorite = this.getAttribute('data-isfavorite') === 'true';
             if (likes === 'true') {
                 likes = true;
-            }
-            else if (likes === 'false') {
+            } else if (likes === 'false') {
                 likes = false;
             } else {
                 likes = null;
@@ -201,4 +199,4 @@ define(['connectionManager', 'serverNotifications', 'events', 'globalize', 'emby
         prototype: EmbyRatingButtonPrototype,
         extends: 'button'
     });
-});
\ No newline at end of file
+});
diff --git a/src/components/userdatabuttons/userdatabuttons.js b/src/components/userdatabuttons/userdatabuttons.js
index ea88565015..1c00e50caf 100644
--- a/src/components/userdatabuttons/userdatabuttons.js
+++ b/src/components/userdatabuttons/userdatabuttons.js
@@ -105,9 +105,9 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
 
             if (itemHelper.canMarkPlayed(item)) {
                 if (userData.Played) {
-                    html += getUserDataButtonHtml('markPlayed', itemId, serverId, btnCssClass + ' btnUserDataOn', iconCssClass, '&#xE5CA;', tooltipPlayed, style);
+                    html += getUserDataButtonHtml('markPlayed', itemId, serverId, btnCssClass + ' btnUserDataOn', iconCssClass, 'check', tooltipPlayed, style);
                 } else {
-                    html += getUserDataButtonHtml('markPlayed', itemId, serverId, btnCssClass, iconCssClass, '&#xE5CA;', tooltipPlayed, style);
+                    html += getUserDataButtonHtml('markPlayed', itemId, serverId, btnCssClass, iconCssClass, 'check', tooltipPlayed, style);
                 }
             }
         }
@@ -131,9 +131,9 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
         var tooltipFavorite = globalize.translate('Favorite');
         if (userData.IsFavorite) {
 
-            html += getUserDataButtonHtml('markFavorite', itemId, serverId, btnCssClass + ' btnUserData btnUserDataOn', iconCssClass, '&#xE87D;', tooltipFavorite, style);
+            html += getUserDataButtonHtml('markFavorite', itemId, serverId, btnCssClass + ' btnUserData btnUserDataOn', iconCssClass, 'favorite', tooltipFavorite, style);
         } else {
-            html += getUserDataButtonHtml('markFavorite', itemId, serverId, btnCssClass + ' btnUserData', iconCssClass, '&#xE87D;', tooltipFavorite, style);
+            html += getUserDataButtonHtml('markFavorite', itemId, serverId, btnCssClass + ' btnUserData', iconCssClass, 'favorite', tooltipFavorite, style);
         }
 
         return html;
@@ -248,4 +248,4 @@ define(['connectionManager', 'globalize', 'dom', 'itemHelper', 'paper-icon-butto
         getIconsHtml: getIconsHtml
     };
 
-});
\ No newline at end of file
+});
diff --git a/src/components/viewContainer.js b/src/components/viewContainer.js
index ece8da1ed6..c2d060162e 100644
--- a/src/components/viewContainer.js
+++ b/src/components/viewContainer.js
@@ -42,7 +42,6 @@ define(["browser", "dom", "layoutManager", "css!components/viewManager/viewConta
             var newViewInfo = normalizeNewView(options, isPluginpage);
             var newView = newViewInfo.elem;
 
-
             if (isPluginpage) {
                 require(["legacyDashboard"]);
             }
diff --git a/src/components/viewManager/viewManager.js b/src/components/viewManager/viewManager.js
index 23612d5a1e..a8e514e06e 100644
--- a/src/components/viewManager/viewManager.js
+++ b/src/components/viewManager/viewManager.js
@@ -50,8 +50,7 @@ define(['viewContainer', 'focusManager', 'queryString', 'layoutManager'], functi
             if (options.autoFocus !== false) {
                 focusManager.autoFocus(view);
             }
-        }
-        else if (!layoutManager.mobile) {
+        } else if (!layoutManager.mobile) {
             if (view.activeElement && document.body.contains(view.activeElement) && focusManager.isCurrentlyFocusable(view.activeElement)) {
                 focusManager.focus(view.activeElement);
             } else {
diff --git a/src/components/viewsettings/viewsettings.js b/src/components/viewsettings/viewsettings.js
index 617e021115..e3c75c6293 100644
--- a/src/components/viewsettings/viewsettings.js
+++ b/src/components/viewsettings/viewsettings.js
@@ -29,7 +29,7 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
         }
 
         userSettings.set(settingsKey + '-imageType', context.querySelector('.selectImageType').value);
-   }
+    }
 
     function centerFocus(elem, horiz, on) {
         require(['scrollHelper'], function (scrollHelper) {
@@ -77,7 +77,7 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
                 var html = '';
 
                 html += '<div class="formDialogHeader">';
-                html += '<button is="paper-icon-button-light" class="btnCancel hide-mouse-idle-tv" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
+                html += '<button is="paper-icon-button-light" class="btnCancel hide-mouse-idle-tv" tabindex="-1"><i class="md-icon">arrow_back</i></button>';
                 html += '<h3 class="formDialogHeaderTitle">${Settings}</h3>';
 
                 html += '</div>';
@@ -143,4 +143,4 @@ define(['require', 'dialogHelper', 'loading', 'apphost', 'layoutManager', 'conne
     };
 
     return ViewSettings;
-});
\ No newline at end of file
+});
diff --git a/src/components/visibleinviewport.js b/src/components/visibleinviewport.js
index 23a2a9d73c..3768740175 100644
--- a/src/components/visibleinviewport.js
+++ b/src/components/visibleinviewport.js
@@ -22,17 +22,17 @@ define(['dom'], function (dom) {
 
         var windowSize = dom.getWindowSize();
 
-        var vpWidth = windowSize.innerWidth,
-            vpHeight = windowSize.innerHeight;
+        var vpWidth = windowSize.innerWidth;
+        var vpHeight = windowSize.innerHeight;
 
         // Use this native browser method, if available.
-        var rec = elem.getBoundingClientRect(),
-            tViz = rec.top >= 0 && rec.top < vpHeight + thresholdY,
-            bViz = rec.bottom > 0 && rec.bottom <= vpHeight + thresholdY,
-            lViz = rec.left >= 0 && rec.left < vpWidth + thresholdX,
-            rViz = rec.right > 0 && rec.right <= vpWidth + thresholdX,
-            vVisible = partial ? tViz || bViz : tViz && bViz,
-            hVisible = partial ? lViz || rViz : lViz && rViz;
+        var rec = elem.getBoundingClientRect();
+        var tViz = rec.top >= 0 && rec.top < vpHeight + thresholdY;
+        var bViz = rec.bottom > 0 && rec.bottom <= vpHeight + thresholdY;
+        var lViz = rec.left >= 0 && rec.left < vpWidth + thresholdX;
+        var rViz = rec.right > 0 && rec.right <= vpWidth + thresholdX;
+        var vVisible = partial ? tViz || bViz : tViz && bViz;
+        var hVisible = partial ? lViz || rViz : lViz && rViz;
 
         return vVisible && hVisible;
     }
diff --git a/src/components/youtubeplayer/plugin.js b/src/components/youtubeplayer/plugin.js
index 1ed95e2110..a2478cd3f4 100644
--- a/src/components/youtubeplayer/plugin.js
+++ b/src/components/youtubeplayer/plugin.js
@@ -135,7 +135,6 @@ define(['require', 'events', 'browser', 'appRouter', 'loading'], function (requi
 
             require(['queryString'], function (queryString) {
 
-
                 instance._currentSrc = options.url;
                 var params = queryString.parse(options.url.split('?')[1]);
                 // 3. This function creates an <iframe> (and YouTube player)
diff --git a/src/controllers/addserver.js b/src/controllers/addserver.js
index 55b670f546..a55ba3066c 100644
--- a/src/controllers/addserver.js
+++ b/src/controllers/addserver.js
@@ -46,6 +46,10 @@ define(["appSettings", "loading", "browser", "emby-button"], function(appSetting
         view.querySelector(".addServerForm").addEventListener("submit", onServerSubmit);
         view.querySelector(".btnCancel").addEventListener("click", goBack);
 
+        require(["autoFocuser"], function (autoFocuser) {
+            autoFocuser.autoFocus(view);
+        });
+
         function onServerSubmit(e) {
             submitServer(view);
             e.preventDefault();
diff --git a/src/controllers/availableplugins.js b/src/controllers/availableplugins.js
index 62131456da..1679fec5e7 100644
--- a/src/controllers/availableplugins.js
+++ b/src/controllers/availableplugins.js
@@ -103,7 +103,7 @@ define(["loading", "libraryMenu", "globalize", "cardStyle", "emby-button", "emby
             html += '<div class="cardImage coveredImage" style="background-image:url(\'' + plugin.thumbImage + "');\">";
             html += "</div>";
         } else {
-            html += '<i class="cardImageIcon md-icon">&#xE2C7;</i>';
+            html += '<i class="cardImageIcon md-icon">folder</i>';
         }
 
         html += "</a>";
diff --git a/src/controllers/dashboardpage.js b/src/controllers/dashboardpage.js
index de86ffc2bd..699c80c80a 100644
--- a/src/controllers/dashboardpage.js
+++ b/src/controllers/dashboardpage.js
@@ -303,12 +303,12 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
                 html += '<div class="sessionCardButtons flex align-items-center justify-content-center">';
                 var btnCssClass;
                 btnCssClass = session.ServerId && session.NowPlayingItem && session.SupportsRemoteControl && session.DeviceId !== connectionManager.deviceId() ? "" : " hide";
-                html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionPlayPause paper-icon-button-light ' + btnCssClass + '"><i class="md-icon">&#xE034;</i></button>';
-                html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionStop paper-icon-button-light ' + btnCssClass + '"><i class="md-icon">&#xE047;</i></button>';
+                html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionPlayPause paper-icon-button-light ' + btnCssClass + '"><i class="md-icon">pause</i></button>';
+                html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionStop paper-icon-button-light ' + btnCssClass + '"><i class="md-icon">stop</i></button>';
                 btnCssClass = session.TranscodingInfo && session.TranscodingInfo.TranscodeReasons && session.TranscodingInfo.TranscodeReasons.length ? "" : " hide";
-                html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionInfo paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate("ViewPlaybackInfo") + '"><i class="md-icon">&#xE88E;</i></button>';
+                html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionInfo paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate("ViewPlaybackInfo") + '"><i class="md-icon">info</i></button>';
                 btnCssClass = session.ServerId && -1 !== session.SupportedCommands.indexOf("DisplayMessage") && session.DeviceId !== connectionManager.deviceId() ? "" : " hide";
-                html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionSendMessage paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate("SendMessage") + '"><i class="md-icon">&#xE0C9;</i></button>';
+                html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionSendMessage paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate("SendMessage") + '"><i class="md-icon">message</i></button>';
                 html += "</div>";
                 html += '<div class="sessionNowPlayingStreamInfo" style="padding:.5em 0 1em;">';
                 html += DashboardPage.getSessionNowPlayingStreamInfo(session);
@@ -525,7 +525,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
             if (session.UserId && session.UserPrimaryImageTag) {
                 return ApiClient.getUserImageUrl(session.UserId, {
                     tag: session.UserPrimaryImageTag,
-                    height: 24,
                     type: "Primary"
                 });
             }
@@ -565,9 +564,9 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
             }
 
             if (session.PlayState && session.PlayState.IsPaused) {
-                btnSessionPlayPause.querySelector("i").innerHTML = "&#xE037;";
+                btnSessionPlayPause.querySelector("i").innerHTML = "play_arrow";
             } else {
-                btnSessionPlayPause.querySelector("i").innerHTML = "&#xE034;";
+                btnSessionPlayPause.querySelector("i").innerHTML = "pause";
             }
 
             row.querySelector(".sessionNowPlayingStreamInfo").innerHTML = DashboardPage.getSessionNowPlayingStreamInfo(session);
@@ -631,7 +630,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
             if (item && item.BackdropImageTags && item.BackdropImageTags.length) {
                 return ApiClient.getScaledImageUrl(item.Id, {
                     type: "Backdrop",
-                    width: 275,
                     tag: item.BackdropImageTags[0]
                 });
             }
@@ -639,7 +637,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
             if (item && item.ParentBackdropImageTags && item.ParentBackdropImageTags.length) {
                 return ApiClient.getScaledImageUrl(item.ParentBackdropItemId, {
                     type: "Backdrop",
-                    width: 275,
                     tag: item.ParentBackdropImageTags[0]
                 });
             }
@@ -647,7 +644,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
             if (item && item.BackdropImageTag) {
                 return ApiClient.getScaledImageUrl(item.BackdropItemId, {
                     type: "Backdrop",
-                    width: 275,
                     tag: item.BackdropImageTag
                 });
             }
@@ -657,7 +653,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
             if (item && imageTags.Thumb) {
                 return ApiClient.getScaledImageUrl(item.Id, {
                     type: "Thumb",
-                    width: 275,
                     tag: imageTags.Thumb
                 });
             }
@@ -665,7 +660,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
             if (item && item.ParentThumbImageTag) {
                 return ApiClient.getScaledImageUrl(item.ParentThumbItemId, {
                     type: "Thumb",
-                    width: 275,
                     tag: item.ParentThumbImageTag
                 });
             }
@@ -673,7 +667,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
             if (item && item.ThumbImageTag) {
                 return ApiClient.getScaledImageUrl(item.ThumbItemId, {
                     type: "Thumb",
-                    width: 275,
                     tag: item.ThumbImageTag
                 });
             }
@@ -681,7 +674,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
             if (item && imageTags.Primary) {
                 return ApiClient.getScaledImageUrl(item.Id, {
                     type: "Primary",
-                    width: 275,
                     tag: imageTags.Primary
                 });
             }
@@ -689,7 +681,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
             if (item && item.PrimaryImageTag) {
                 return ApiClient.getScaledImageUrl(item.PrimaryImageItemId, {
                     type: "Primary",
-                    width: 275,
                     tag: item.PrimaryImageTag
                 });
             }
@@ -697,7 +688,6 @@ define(["datetime", "events", "itemHelper", "serverNotifications", "dom", "globa
             if (item && item.AlbumPrimaryImageTag) {
                 return ApiClient.getScaledImageUrl(item.AlbumId, {
                     type: "Primary",
-                    width: 275,
                     tag: item.AlbumPrimaryImageTag
                 });
             }
diff --git a/src/controllers/devices.js b/src/controllers/devices.js
index 36f2cf88a6..897282a0ef 100644
--- a/src/controllers/devices.js
+++ b/src/controllers/devices.js
@@ -35,7 +35,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "hu
             menuItems.push({
                 name: globalize.translate("Edit"),
                 id: "open",
-                ironIcon: "mode-edit"
+                icon: "mode_edit"
             });
         }
 
@@ -43,7 +43,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "hu
             menuItems.push({
                 name: globalize.translate("Delete"),
                 id: "delete",
-                ironIcon: "delete"
+                icon: "delete"
             });
         }
 
@@ -89,7 +89,7 @@ define(["loading", "dom", "libraryMenu", "globalize", "scripts/imagehelper", "hu
 
             if (canEdit || canDelete(device.Id)) {
                 deviceHtml += '<div style="text-align:right; float:right;padding-top:5px;">';
-                deviceHtml += '<button type="button" is="paper-icon-button-light" data-id="' + device.Id + '" title="' + globalize.translate("Menu") + '" class="btnDeviceMenu"><i class="md-icon">&#xE5D3;</i></button>';
+                deviceHtml += '<button type="button" is="paper-icon-button-light" data-id="' + device.Id + '" title="' + globalize.translate("Menu") + '" class="btnDeviceMenu"><i class="md-icon">more_horiz</i></button>';
                 deviceHtml += "</div>";
             }
 
diff --git a/src/controllers/favorites.js b/src/controllers/favorites.js
index 6c521f7bfe..0bfe3c4550 100644
--- a/src/controllers/favorites.js
+++ b/src/controllers/favorites.js
@@ -1,4 +1,4 @@
-define(["appRouter", "cardBuilder", "dom", "globalize", "connectionManager", "apphost", "layoutManager", "focusManager", "emby-itemscontainer", "emby-scroller"], function(appRouter, cardBuilder, dom, globalize, connectionManager, appHost, layoutManager, focusManager) {
+define(["appRouter", "cardBuilder", "dom", "globalize", "connectionManager", "apphost", "layoutManager", "focusManager", "emby-itemscontainer", "emby-scroller"], function (appRouter, cardBuilder, dom, globalize, connectionManager, appHost, layoutManager, focusManager) {
     "use strict";
 
     function enableScrollX() {
@@ -22,92 +22,103 @@ define(["appRouter", "cardBuilder", "dom", "globalize", "connectionManager", "ap
             name: "HeaderFavoriteMovies",
             types: "Movie",
             shape: getPosterShape(),
-            showTitle: !0,
-            showYear: !0,
-            overlayPlayButton: !0,
-            overlayText: !1,
-            centerText: !0
+            showTitle: true,
+            showYear: true,
+            overlayPlayButton: true,
+            overlayText: false,
+            centerText: true
         }, {
             name: "HeaderFavoriteShows",
             types: "Series",
             shape: getPosterShape(),
-            showTitle: !0,
-            showYear: !0,
-            overlayPlayButton: !0,
-            overlayText: !1,
-            centerText: !0
+            showTitle: true,
+            showYear: true,
+            overlayPlayButton: true,
+            overlayText: false,
+            centerText: true
         }, {
             name: "HeaderFavoriteEpisodes",
             types: "Episode",
             shape: getThumbShape(),
-            preferThumb: !1,
-            showTitle: !0,
-            showParentTitle: !0,
-            overlayPlayButton: !0,
-            overlayText: !1,
-            centerText: !0
+            preferThumb: false,
+            showTitle: true,
+            showParentTitle: true,
+            overlayPlayButton: true,
+            overlayText: false,
+            centerText: true
         }, {
             name: "HeaderFavoriteVideos",
             types: "Video",
             shape: getThumbShape(),
-            preferThumb: !0,
-            showTitle: !0,
-            overlayPlayButton: !0,
-            overlayText: !1,
-            centerText: !0
+            preferThumb: true,
+            showTitle: true,
+            overlayPlayButton: true,
+            overlayText: false,
+            centerText: true
         }, {
             name: "HeaderFavoriteCollections",
             types: "BoxSet",
             shape: getPosterShape(),
-            showTitle: !0,
-            overlayPlayButton: !0,
-            overlayText: !1,
-            centerText: !0
+            showTitle: true,
+            overlayPlayButton: true,
+            overlayText: false,
+            centerText: true
         }, {
             name: "HeaderFavoritePlaylists",
             types: "Playlist",
             shape: getSquareShape(),
-            preferThumb: !1,
-            showTitle: !0,
-            overlayText: !1,
-            showParentTitle: !1,
-            centerText: !0,
-            overlayPlayButton: !0,
-            coverImage: !0
+            preferThumb: false,
+            showTitle: true,
+            overlayText: false,
+            showParentTitle: false,
+            centerText: true,
+            overlayPlayButton: true,
+            coverImage: true
+        }, {
+            name: "HeaderFavoritePeople",
+            types: "Person",
+            shape: getPosterShape(),
+            preferThumb: false,
+            showTitle: true,
+            overlayText: false,
+            showParentTitle: false,
+            centerText: true,
+            overlayPlayButton: true,
+            coverImage: true
         }, {
             name: "HeaderFavoriteArtists",
             types: "MusicArtist",
             shape: getSquareShape(),
-            preferThumb: !1,
-            showTitle: !0,
-            overlayText: !1,
-            showParentTitle: !1,
-            centerText: !0,
-            overlayPlayButton: !0,
-            coverImage: !0
+            preferThumb: false,
+            showTitle: true,
+            overlayText: false,
+            showParentTitle: false,
+            centerText: true,
+            overlayPlayButton: true,
+            coverImage: true
         }, {
             name: "HeaderFavoriteAlbums",
             types: "MusicAlbum",
             shape: getSquareShape(),
-            preferThumb: !1,
-            showTitle: !0,
-            overlayText: !1,
-            showParentTitle: !0,
-            centerText: !0,
-            overlayPlayButton: !0,
-            coverImage: !0
+            preferThumb: false,
+            showTitle: true,
+            overlayText: false,
+            showParentTitle: true,
+            centerText: true,
+            overlayPlayButton: true,
+            coverImage: true
         }, {
             name: "HeaderFavoriteSongs",
             types: "Audio",
             shape: getSquareShape(),
-            preferThumb: !1,
-            showTitle: !0,
-            overlayText: !1,
-            showParentTitle: !0,
-            centerText: !0,
-            overlayMoreButton: !0,
+            preferThumb: false,
+            showTitle: true,
+            overlayText: false,
+            showParentTitle: true,
+            centerText: true,
+            overlayMoreButton: true,
             action: "instantmix",
-            coverImage: !0
+            coverImage: true
         }, {
             name: "HeaderFavoriteBooks",
             types: "Book",
@@ -117,59 +128,82 @@ define(["appRouter", "cardBuilder", "dom", "globalize", "connectionManager", "ap
             overlayPlayButton: true,
             overlayText: false,
             centerText: true
-        }]
+        }];
     }
 
     function getFetchDataFn(section) {
-        return function() {
-            var apiClient = this.apiClient,
-                options = {
-                    SortBy: (section.types, "SeriesName,SortName"),
-                    SortOrder: "Ascending",
-                    Filters: "IsFavorite",
-                    Recursive: !0,
-                    Fields: "PrimaryImageAspectRatio,BasicSyncInfo",
-                    CollapseBoxSetItems: !1,
-                    ExcludeLocationTypes: "Virtual",
-                    EnableTotalRecordCount: !1
-                };
+        return function () {
+            var apiClient = this.apiClient;
+            var options = {
+                SortBy: (section.types, "SeriesName,SortName"),
+                SortOrder: "Ascending",
+                Filters: "IsFavorite",
+                Recursive: true,
+                Fields: "PrimaryImageAspectRatio,BasicSyncInfo",
+                CollapseBoxSetItems: false,
+                ExcludeLocationTypes: "Virtual",
+                EnableTotalRecordCount: false
+            };
             options.Limit = 20;
             var userId = apiClient.getCurrentUserId();
-            return "MusicArtist" === section.types ? apiClient.getArtists(userId, options) : (options.IncludeItemTypes = section.types, apiClient.getItems(userId, options))
-        }
+
+            if ("MusicArtist" === section.types) {
+                return apiClient.getArtists(userId, options);
+            }
+
+            if ("Person" === section.types) {
+                return apiClient.getPeople(userId, options);
+            }
+
+            options.IncludeItemTypes = section.types;
+            return apiClient.getItems(userId, options);
+        };
     }
 
     function getRouteUrl(section, serverId) {
         return appRouter.getRouteUrl("list", {
             serverId: serverId,
             itemTypes: section.types,
-            isFavorite: !0
-        })
+            isFavorite: true
+        });
     }
 
     function getItemsHtmlFn(section) {
-        return function(items) {
-            var supportsImageAnalysis = appHost.supports("imageanalysis"),
-                cardLayout = (appHost.preferVisualCards || supportsImageAnalysis) && section.autoCardLayout && section.showTitle;
-            cardLayout = !1;
-            var serverId = this.apiClient.serverId(),
-                leadingButtons = layoutManager.tv ? [{
-                    name: globalize.translate("All"),
-                    id: "more",
-                    icon: "&#xE87D;",
-                    routeUrl: getRouteUrl(section, serverId)
-                }] : null,
-                lines = 0;
-            return section.showTitle && lines++, section.showYear && lines++, section.showParentTitle && lines++, cardBuilder.getCardsHtml({
+        return function (items) {
+            var supportsImageAnalysis = appHost.supports("imageanalysis");
+            var cardLayout = (appHost.preferVisualCards || supportsImageAnalysis) && section.autoCardLayout && section.showTitle;
+            cardLayout = false;
+            var serverId = this.apiClient.serverId();
+            var leadingButtons = layoutManager.tv ? [{
+                name: globalize.translate("All"),
+                id: "more",
+                icon: "favorite",
+                routeUrl: getRouteUrl(section, serverId)
+            }] : null;
+            var lines = 0;
+
+            if (section.showTitle) {
+                lines++;
+            }
+
+            if (section.showYear) {
+                lines++;
+            }
+
+            if (section.showParentTitle) {
+                lines++;
+            }
+
+            return cardBuilder.getCardsHtml({
                 items: items,
                 preferThumb: section.preferThumb,
                 shape: section.shape,
                 centerText: section.centerText && !cardLayout,
-                overlayText: !1 !== section.overlayText,
+                overlayText: false !== section.overlayText,
                 showTitle: section.showTitle,
                 showYear: section.showYear,
                 showParentTitle: section.showParentTitle,
-                scalable: !0,
+                scalable: true,
                 coverImage: section.coverImage,
                 overlayPlayButton: section.overlayPlayButton,
                 overlayMoreButton: section.overlayMoreButton && !cardLayout,
@@ -178,39 +212,100 @@ define(["appRouter", "cardBuilder", "dom", "globalize", "connectionManager", "ap
                 cardLayout: cardLayout,
                 leadingButtons: leadingButtons,
                 lines: lines
-            })
-        }
+            });
+        };
     }
 
     function FavoritesTab(view, params) {
-        this.view = view, this.params = params, this.apiClient = connectionManager.currentApiClient(), this.sectionsContainer = view.querySelector(".sections"), createSections(this, this.sectionsContainer, this.apiClient)
+        this.view = view;
+        this.params = params;
+        this.apiClient = connectionManager.currentApiClient();
+        this.sectionsContainer = view.querySelector(".sections");
+        createSections(this, this.sectionsContainer, this.apiClient);
     }
 
     function createSections(instance, elem, apiClient) {
-        var i, length, sections = getSections(),
-            html = "";
+        var i;
+        var length;
+        var sections = getSections();
+        var html = "";
+
         for (i = 0, length = sections.length; i < length; i++) {
-            var section = sections[i],
-                sectionClass = "verticalSection";
-            section.showTitle || (sectionClass += " verticalSection-extrabottompadding"), html += '<div class="' + sectionClass + ' hide">', html += '<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">', layoutManager.tv ? html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate(section.name) + "</h2>" : (html += '<a is="emby-linkbutton" href="' + getRouteUrl(section, apiClient.serverId()) + '" class="more button-flat button-flat-mini sectionTitleTextButton">', html += '<h2 class="sectionTitle sectionTitle-cards">', html += globalize.translate(section.name), html += "</h2>", html += '<i class="md-icon">&#xE5CC;</i>', html += "</a>"), html += "</div>", html += '<div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-mousewheel="false" data-centerfocus="true"><div is="emby-itemscontainer" class="itemsContainer scrollSlider focuscontainer-x padded-left padded-right" data-monitor="markfavorite"></div></div>', html += "</div>"
+            var section = sections[i];
+            var sectionClass = "verticalSection";
+
+            if (!section.showTitle) {
+                sectionClass += " verticalSection-extrabottompadding";
+            }
+
+            html += '<div class="' + sectionClass + ' hide">';
+            html += '<div class="sectionTitleContainer sectionTitleContainer-cards padded-left">';
+
+            if (layoutManager.tv) {
+                html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate(section.name) + "</h2>";
+            } else {
+                html += '<a is="emby-linkbutton" href="' + getRouteUrl(section, apiClient.serverId()) + '" class="more button-flat button-flat-mini sectionTitleTextButton">';
+                html += '<h2 class="sectionTitle sectionTitle-cards">';
+                html += globalize.translate(section.name);
+                html += "</h2>";
+                html += '<i class="md-icon">chevron_right</i>';
+                html += "</a>";
+            }
+
+            html += "</div>";
+            html += '<div is="emby-scroller" class="padded-top-focusscale padded-bottom-focusscale" data-mousewheel="false" data-centerfocus="true"><div is="emby-itemscontainer" class="itemsContainer scrollSlider focuscontainer-x" data-monitor="markfavorite"></div></div>';
+            html += "</div>";
         }
+
         elem.innerHTML = html;
         var elems = elem.querySelectorAll(".itemsContainer");
+
         for (i = 0, length = elems.length; i < length; i++) {
             var itemsContainer = elems[i];
-            itemsContainer.fetchData = getFetchDataFn(sections[i]).bind(instance), itemsContainer.getItemsHtml = getItemsHtmlFn(sections[i]).bind(instance), itemsContainer.parentContainer = dom.parentWithClass(itemsContainer, "verticalSection")
+            itemsContainer.fetchData = getFetchDataFn(sections[i]).bind(instance);
+            itemsContainer.getItemsHtml = getItemsHtmlFn(sections[i]).bind(instance);
+            itemsContainer.parentContainer = dom.parentWithClass(itemsContainer, "verticalSection");
         }
     }
-    return FavoritesTab.prototype.onResume = function(options) {
-        for (var promises = (this.apiClient, []), view = this.view, elems = this.sectionsContainer.querySelectorAll(".itemsContainer"), i = 0, length = elems.length; i < length; i++) promises.push(elems[i].resume(options));
-        Promise.all(promises).then(function() {
-            options.autoFocus && focusManager.autoFocus(view)
-        })
-    }, FavoritesTab.prototype.onPause = function() {
-        for (var elems = this.sectionsContainer.querySelectorAll(".itemsContainer"), i = 0, length = elems.length; i < length; i++) elems[i].pause()
-    }, FavoritesTab.prototype.destroy = function() {
-        this.view = null, this.params = null, this.apiClient = null;
-        for (var elems = this.sectionsContainer.querySelectorAll(".itemsContainer"), i = 0, length = elems.length; i < length; i++) elems[i].fetchData = null, elems[i].getItemsHtml = null, elems[i].parentContainer = null;
-        this.sectionsContainer = null
-    }, FavoritesTab
+
+    FavoritesTab.prototype.onResume = function (options) {
+        var promises = (this.apiClient, []);
+        var view = this.view;
+        var elems = this.sectionsContainer.querySelectorAll(".itemsContainer");
+
+        for (var i = 0, length = elems.length; i < length; i++) {
+            promises.push(elems[i].resume(options));
+        }
+
+        Promise.all(promises).then(function () {
+            if (options.autoFocus) {
+                focusManager.autoFocus(view);
+            }
+        });
+    };
+
+    FavoritesTab.prototype.onPause = function () {
+        var elems = this.sectionsContainer.querySelectorAll(".itemsContainer");
+
+        for (var i = 0, length = elems.length; i < length; i++) {
+            elems[i].pause();
+        }
+    };
+
+    FavoritesTab.prototype.destroy = function () {
+        this.view = null;
+        this.params = null;
+        this.apiClient = null;
+        var elems = this.sectionsContainer.querySelectorAll(".itemsContainer");
+
+        for (var i = 0, length = elems.length; i < length; i++) {
+            elems[i].fetchData = null;
+            elems[i].getItemsHtml = null;
+            elems[i].parentContainer = null;
+        }
+
+        this.sectionsContainer = null;
+    };
+
+    return FavoritesTab;
 });
diff --git a/src/controllers/installedplugins.js b/src/controllers/installedplugins.js
index a88f49d186..c18673738e 100644
--- a/src/controllers/installedplugins.js
+++ b/src/controllers/installedplugins.js
@@ -47,7 +47,7 @@ define(["loading", "libraryMenu", "dom", "globalize", "cardStyle", "emby-button"
             html += '<div class="cardImage coveredImage" style="background-image:url(\'' + plugin.ImageUrl + "');\">";
             html += "</div>";
         } else {
-            html += '<i class="cardImageIcon md-icon">&#xE2C7;</i>';
+            html += '<i class="cardImageIcon md-icon">folder</i>';
         }
 
         html += configPageUrl ? "</a>" : "</div>";
@@ -116,14 +116,14 @@ define(["loading", "libraryMenu", "dom", "globalize", "cardStyle", "emby-button"
             menuItems.push({
                 name: globalize.translate("ButtonSettings"),
                 id: "open",
-                ironIcon: "mode-edit"
+                icon: "mode_edit"
             });
         }
 
         menuItems.push({
             name: globalize.translate("ButtonUninstall"),
             id: "delete",
-            ironIcon: "delete"
+            icon: "delete"
         });
 
         require(["actionsheet"], function (actionsheet) {
diff --git a/src/controllers/itemdetailpage.js b/src/controllers/itemdetailpage.js
index 5bc54edf74..1ce35efe4c 100644
--- a/src/controllers/itemdetailpage.js
+++ b/src/controllers/itemdetailpage.js
@@ -459,7 +459,6 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
             imgUrl = apiClient.getScaledImageUrl(item.Id, {
                 type: "Thumb",
                 index: 0,
-                maxWidth: screenWidth,
                 tag: item.ImageTags.Thumb
             });
             itemBackdropElement.classList.remove("noBackdrop");
@@ -469,7 +468,6 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
             imgUrl = apiClient.getScaledImageUrl(item.Id, {
                 type: "Primary",
                 index: 0,
-                maxWidth: screenWidth,
                 tag: item.ImageTags.Primary
             });
             itemBackdropElement.classList.remove("noBackdrop");
@@ -479,7 +477,6 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
             imgUrl = apiClient.getScaledImageUrl(item.Id, {
                 type: "Backdrop",
                 index: 0,
-                maxWidth: screenWidth,
                 tag: item.BackdropImageTags[0]
             });
             itemBackdropElement.classList.remove("noBackdrop");
@@ -489,8 +486,7 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
             imgUrl = apiClient.getScaledImageUrl(item.ParentBackdropItemId, {
                 type: "Backdrop",
                 index: 0,
-                tag: item.ParentBackdropImageTags[0],
-                maxWidth: screenWidth
+                tag: item.ParentBackdropImageTags[0]
             });
             itemBackdropElement.classList.remove("noBackdrop");
             imageLoader.lazyImage(itemBackdropElement, imgUrl, false);
@@ -499,7 +495,6 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
             imgUrl = apiClient.getScaledImageUrl(item.Id, {
                 type: "Thumb",
                 index: 0,
-                maxWidth: screenWidth,
                 tag: item.ImageTags.Thumb
             });
             itemBackdropElement.classList.remove("noBackdrop");
@@ -617,24 +612,9 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
             hideAll(page, "btnDownload", true);
         }
 
-        try {
-            require(["focusManager"], function (focusManager) {
-                [".btnResume", ".btnPlay"].every(function (cls) {
-                    var elems = page.querySelectorAll(cls);
-
-                    for (var i = 0; i < elems.length; i++) {
-                        if (focusManager.isCurrentlyFocusable(elems[i])) {
-                            focusManager.focus(elems[i]);
-                            return false;
-                        }
-                    }
-
-                    return true;
-                });
-            });
-        } catch (e) {
-            console.log(e);
-        }
+        require(["autoFocuser"], function (autoFocuser) {
+            autoFocuser.autoFocus(page);
+        });
     }
 
     function logoImageUrl(item, apiClient, options) {
@@ -822,7 +802,7 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
         if (detectRatio && item.PrimaryImageAspectRatio) {
             if (item.PrimaryImageAspectRatio >= 1.48) {
                 shape = "thumb";
-            } else if (item.PrimaryImageAspectRatio >= .85 && item.PrimaryImageAspectRatio <= 1.34) {
+            } else if (item.PrimaryImageAspectRatio >= 0.85 && item.PrimaryImageAspectRatio <= 1.34) {
                 shape = "square";
             }
         }
@@ -858,7 +838,6 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
             elem.classList.remove("squareDetailImageContainer");
         }
 
-
         if (url) {
             imageLoader.lazyImage(elem.querySelector("img"), url);
         }
@@ -1730,6 +1709,12 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
             hideAll(page, "btnPlay", false);
             hideAll(page, "btnShuffle", false);
         }
+
+        // HACK: Call autoFocuser again because btnPlay may be hidden, but focused by reloadFromItem
+        // FIXME: Sometimes focus does not move until all (?) sections are loaded
+        require(["autoFocuser"], function (autoFocuser) {
+            autoFocuser.autoFocus(page);
+        });
     }
 
     function renderCollectionItemType(page, parentItem, type, items) {
@@ -1739,7 +1724,7 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
         html += '<h2 class="sectionTitle sectionTitle-cards">';
         html += "<span>" + type.name + "</span>";
         html += "</h2>";
-        html += '<button class="btnAddToCollection sectionTitleButton" type="button" is="paper-icon-button-light" style="margin-left:1em;"><i class="md-icon" icon="add">&#xE145;</i></button>';
+        html += '<button class="btnAddToCollection sectionTitleButton" type="button" is="paper-icon-button-light" style="margin-left:1em;"><i class="md-icon" icon="add">add</i></button>';
         html += "</div>";
         html += '<div is="emby-itemscontainer" class="itemsContainer collectionItemsContainer vertical-wrap padded-left padded-right">';
         var shape = "MusicAlbum" == type.type ? getSquareShape(false) : getPortraitShape(false);
@@ -2075,7 +2060,7 @@ define(["loading", "appRouter", "layoutManager", "connectionManager", "cardBuild
         bindAll(view, ".btnCancelTimer", "click", onCancelTimerClick);
         bindAll(view, ".btnDeleteItem", "click", onDeleteClick);
         bindAll(view, ".btnDownload", "click", onDownloadClick);
-        view.querySelector(".btnMoreCommands i").innerHTML = "&#xE5D3;";
+        view.querySelector(".btnMoreCommands i").innerHTML = "more_horiz";
         view.querySelector(".trackSelections").addEventListener("submit", onTrackSelectionsSubmit);
         view.querySelector(".btnSplitVersions").addEventListener("click", function () {
             splitVersions(self, view, apiClient, params);
diff --git a/src/controllers/librarydisplay.js b/src/controllers/librarydisplay.js
index 5ee86a4563..10a0eb945b 100644
--- a/src/controllers/librarydisplay.js
+++ b/src/controllers/librarydisplay.js
@@ -60,11 +60,11 @@ define(["globalize", "loading", "libraryMenu", "emby-checkbox", "emby-button", "
             libraryMenu.setTabs("librarysetup", 1, getTabs);
             loadData();
             ApiClient.getSystemInfo().then(function(info) {
-                 if ("Windows" === info.OperatingSystem) {
-                     view.querySelector(".fldSaveMetadataHidden").classList.remove("hide");
-                 } else {
-                     view.querySelector(".fldSaveMetadataHidden").classList.add("hide");
-                 }
+                if ("Windows" === info.OperatingSystem) {
+                    view.querySelector(".fldSaveMetadataHidden").classList.remove("hide");
+                } else {
+                    view.querySelector(".fldSaveMetadataHidden").classList.add("hide");
+                }
             });
         });
     }
diff --git a/src/controllers/list.js b/src/controllers/list.js
index d15ebd2444..a554bec611 100644
--- a/src/controllers/list.js
+++ b/src/controllers/list.js
@@ -175,7 +175,7 @@ define(["globalize", "listView", "layoutManager", "userSettings", "focusManager"
             var btnSortIcon = instance.btnSortIcon;
 
             if (btnSortIcon) {
-                btnSortIcon.innerHTML = "Descending" === values.sortOrder ? "&#xE5DB;" : "&#xE5D8;";
+                btnSortIcon.innerHTML = "Descending" === values.sortOrder ? "arrow_downward" : "arrow_upward";
             }
         }
     }
diff --git a/src/controllers/livetv/livetvchannels.js b/src/controllers/livetv/livetvchannels.js
index 3e310a17a3..2de7e81843 100644
--- a/src/controllers/livetv/livetvchannels.js
+++ b/src/controllers/livetv/livetvchannels.js
@@ -102,6 +102,10 @@ define(["cardBuilder", "imageLoader", "libraryBrowser", "loading", "events", "em
                 renderChannels(context, result);
                 loading.hide();
                 isLoading = false;
+
+                require(["autoFocuser"], function (autoFocuser) {
+                    autoFocuser.autoFocus(view);
+                });
             });
         }
 
diff --git a/src/controllers/livetv/livetvsuggested.js b/src/controllers/livetv/livetvsuggested.js
index 509b7f521c..8f65df7e6f 100644
--- a/src/controllers/livetv/livetvsuggested.js
+++ b/src/controllers/livetv/livetvsuggested.js
@@ -49,6 +49,10 @@ define(["layoutManager", "userSettings", "inputManager", "loading", "globalize",
                 showAirEndTime: true
             });
             loading.hide();
+
+            require(["autoFocuser"], function (autoFocuser) {
+                autoFocuser.autoFocus(page);
+            });
         });
     }
 
diff --git a/src/controllers/loginpage.js b/src/controllers/loginpage.js
index ef54d20bf7..8dd041a9f1 100644
--- a/src/controllers/loginpage.js
+++ b/src/controllers/loginpage.js
@@ -116,6 +116,10 @@ define(["apphost", "appSettings", "dom", "connectionManager", "loading", "layout
             view.querySelector(".visualLoginForm").classList.remove("hide");
             view.querySelector(".manualLoginForm").classList.add("hide");
             view.querySelector(".btnManual").classList.remove("hide");
+
+            require(["autoFocuser"], function (autoFocuser) {
+                autoFocuser.autoFocus(view);
+            });
         }
 
         view.querySelector("#divUsers").addEventListener("click", function(e) {
diff --git a/src/controllers/medialibrarypage.js b/src/controllers/medialibrarypage.js
index 6b616ce58d..543acf31da 100644
--- a/src/controllers/medialibrarypage.js
+++ b/src/controllers/medialibrarypage.js
@@ -88,27 +88,27 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl
         menuItems.push({
             name: globalize.translate("ButtonEditImages"),
             id: "editimages",
-            ironIcon: "photo"
+            icon: "photo"
         });
         menuItems.push({
             name: globalize.translate("ManageLibrary"),
             id: "edit",
-            ironIcon: "folder_open"
+            icon: "folder_open"
         });
         menuItems.push({
             name: globalize.translate("ButtonRemove"),
             id: "delete",
-            ironIcon: "remove"
+            icon: "delete"
         });
         menuItems.push({
             name: globalize.translate("ButtonRename"),
             id: "rename",
-            ironIcon: "mode_edit"
+            icon: "mode_edit"
         });
         menuItems.push({
             name: globalize.translate("ScanLibrary"),
             id: "refresh",
-            ironIcon: "refresh"
+            icon: "refresh"
         });
 
         require(["actionsheet"], function (actionsheet) {
@@ -297,7 +297,7 @@ define(["jQuery", "apphost", "scripts/taskbutton", "loading", "libraryMenu", "gl
 
         if (virtualFolder.showMenu !== false) {
             html += '<div style="text-align:right; float:right;padding-top:5px;">';
-            html += '<button type="button" is="paper-icon-button-light" class="btnCardMenu autoSize"><i class="md-icon">&#xE5D3;</i></button>';
+            html += '<button type="button" is="paper-icon-button-light" class="btnCardMenu autoSize"><i class="md-icon">more_horiz</i></button>';
             html += "</div>";
         }
 
diff --git a/src/controllers/movies/moviecollections.js b/src/controllers/movies/moviecollections.js
index d5bd96d349..f17f64b7c8 100644
--- a/src/controllers/movies/moviecollections.js
+++ b/src/controllers/movies/moviecollections.js
@@ -172,6 +172,10 @@ define(["loading", "events", "libraryBrowser", "imageLoader", "listView", "cardB
                 libraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
                 loading.hide();
                 isLoading = false;
+
+                require(["autoFocuser"], function (autoFocuser) {
+                    autoFocuser.autoFocus(page);
+                });
             });
         }
 
diff --git a/src/controllers/movies/moviegenres.js b/src/controllers/movies/moviegenres.js
index 80197b01cc..e51274d254 100644
--- a/src/controllers/movies/moviegenres.js
+++ b/src/controllers/movies/moviegenres.js
@@ -142,7 +142,7 @@ define(["layoutManager", "loading", "libraryBrowser", "cardBuilder", "lazyLoader
                     html += '<h2 class="sectionTitle sectionTitle-cards">';
                     html += item.Name;
                     html += "</h2>";
-                    html += '<i class="md-icon hide">&#xE5CC;</i>';
+                    html += '<i class="md-icon hide">chevron_right</i>';
                     html += "</a>";
                     html += "</div>";
                     if (enableScrollX()) {
diff --git a/src/controllers/movies/movies.js b/src/controllers/movies/movies.js
index b4e30602fd..3a365acc90 100644
--- a/src/controllers/movies/movies.js
+++ b/src/controllers/movies/movies.js
@@ -77,6 +77,10 @@ define(["loading", "layoutManager", "userSettings", "events", "libraryBrowser",
 
             isLoading = false;
             loading.hide();
+
+            require(["autoFocuser"], function (autoFocuser) {
+                autoFocuser.autoFocus(tabContent);
+            });
         }
 
         function getItemsHtml(items) {
diff --git a/src/controllers/movies/moviesrecommended.js b/src/controllers/movies/moviesrecommended.js
index 82c0b6a12d..0327217e44 100644
--- a/src/controllers/movies/moviesrecommended.js
+++ b/src/controllers/movies/moviesrecommended.js
@@ -36,6 +36,9 @@ define(["events", "layoutManager", "inputManager", "userSettings", "libraryMenu"
                 showYear: true,
                 centerText: true
             });
+
+            // FIXME: Wait for all sections to load
+            autoFocus(page);
         });
     }
 
@@ -76,6 +79,9 @@ define(["events", "layoutManager", "inputManager", "userSettings", "libraryMenu"
                 showYear: true,
                 centerText: true
             });
+
+            // FIXME: Wait for all sections to load
+            autoFocus(page);
         });
     }
 
@@ -147,6 +153,15 @@ define(["events", "layoutManager", "inputManager", "userSettings", "libraryMenu"
             var recs = page.querySelector(".recommendations");
             recs.innerHTML = html;
             imageLoader.lazyChildren(recs);
+
+            // FIXME: Wait for all sections to load
+            autoFocus(page);
+        });
+    }
+
+    function autoFocus(page) {
+        require(["autoFocuser"], function (autoFocuser) {
+            autoFocuser.autoFocus(page);
         });
     }
 
diff --git a/src/controllers/music/musicalbums.js b/src/controllers/music/musicalbums.js
index ac45d9a15b..0cfb61e2b6 100644
--- a/src/controllers/music/musicalbums.js
+++ b/src/controllers/music/musicalbums.js
@@ -160,6 +160,10 @@ define(["layoutManager", "playbackManager", "loading", "events", "libraryBrowser
                 libraryBrowser.saveQueryValues(getSavedQueryKey(), query);
                 loading.hide();
                 isLoading = false;
+
+                require(["autoFocuser"], function (autoFocuser) {
+                    autoFocuser.autoFocus(tabContent);
+                });
             });
         }
 
diff --git a/src/controllers/music/musicartists.js b/src/controllers/music/musicartists.js
index 5159f635f8..aaeea8c885 100644
--- a/src/controllers/music/musicartists.js
+++ b/src/controllers/music/musicartists.js
@@ -144,6 +144,10 @@ define(["layoutManager", "loading", "events", "libraryBrowser", "imageLoader", "
                 libraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
                 loading.hide();
                 isLoading = false;
+
+                require(["autoFocuser"], function (autoFocuser) {
+                    autoFocuser.autoFocus(tabContent);
+                });
             });
         }
 
diff --git a/src/controllers/music/musicgenres.js b/src/controllers/music/musicgenres.js
index ed1efc0a6a..b465a4d350 100644
--- a/src/controllers/music/musicgenres.js
+++ b/src/controllers/music/musicgenres.js
@@ -61,7 +61,7 @@ define(["libraryBrowser", "cardBuilder", "apphost", "imageLoader", "loading"], f
                         preferThumb: true,
                         context: 'music',
                         cardLayout: true,
-                        showTitle: true,
+                        showTitle: true
                     });
                 } else if (viewStyle == "PosterCard") {
                     html = cardBuilder.getCardsHtml({
@@ -69,7 +69,7 @@ define(["libraryBrowser", "cardBuilder", "apphost", "imageLoader", "loading"], f
                         shape: "auto",
                         context: 'music',
                         cardLayout: true,
-                        showTitle: true,
+                        showTitle: true
                     });
                 } else if (viewStyle == "Poster") {
                     html = cardBuilder.getCardsHtml({
@@ -87,6 +87,10 @@ define(["libraryBrowser", "cardBuilder", "apphost", "imageLoader", "loading"], f
                 imageLoader.lazyChildren(elem);
                 libraryBrowser.saveQueryValues(getSavedQueryKey(), query);
                 loading.hide();
+
+                require(["autoFocuser"], function (autoFocuser) {
+                    autoFocuser.autoFocus(context);
+                });
             });
         }
 
diff --git a/src/controllers/music/musicplaylists.js b/src/controllers/music/musicplaylists.js
index 964896077b..fd458c88ac 100644
--- a/src/controllers/music/musicplaylists.js
+++ b/src/controllers/music/musicplaylists.js
@@ -58,6 +58,10 @@ define(["libraryBrowser", "cardBuilder", "apphost", "imageLoader", "loading"], f
                 imageLoader.lazyChildren(elem);
                 libraryBrowser.saveQueryValues(getSavedQueryKey(), query);
                 loading.hide();
+
+                require(["autoFocuser"], function (autoFocuser) {
+                    autoFocuser.autoFocus(context);
+                });
             });
         }
 
diff --git a/src/controllers/music/musicrecommended.js b/src/controllers/music/musicrecommended.js
index fc3371833d..556877aa1b 100644
--- a/src/controllers/music/musicrecommended.js
+++ b/src/controllers/music/musicrecommended.js
@@ -59,6 +59,10 @@ define(["browser", "layoutManager", "userSettings", "inputManager", "loading", "
             });
             imageLoader.lazyChildren(elem);
             loading.hide();
+
+            require(["autoFocuser"], function (autoFocuser) {
+                autoFocuser.autoFocus(page);
+            });
         });
     }
 
diff --git a/src/controllers/music/songs.js b/src/controllers/music/songs.js
index 4806195edd..47263be0d2 100644
--- a/src/controllers/music/songs.js
+++ b/src/controllers/music/songs.js
@@ -104,6 +104,10 @@ define(["events", "libraryBrowser", "imageLoader", "listView", "loading", "emby-
                 libraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
                 loading.hide();
                 isLoading = false;
+
+                require(["autoFocuser"], function (autoFocuser) {
+                    autoFocuser.autoFocus(page);
+                });
             });
         }
 
diff --git a/src/controllers/networking.js b/src/controllers/networking.js
index ef19732ee4..a6e42967a4 100644
--- a/src/controllers/networking.js
+++ b/src/controllers/networking.js
@@ -72,8 +72,8 @@ define(["loading", "libraryMenu", "globalize", "emby-checkbox", "emby-select"],
     }
 
     function validateHttps(form) {
-        var certPath = form.querySelector("#txtCertificatePath").value || null,
-            httpsMode = form.querySelector("#selectHttpsMode").value;
+        var certPath = form.querySelector("#txtCertificatePath").value || null;
+        var httpsMode = form.querySelector("#selectHttpsMode").value;
         return "enabled" !== httpsMode && "required" !== httpsMode || certPath ? Promise.resolve() : new Promise(function(resolve, reject) {
             return alertText({
                 title: globalize.translate("TitleHostingSettings"),
diff --git a/src/controllers/scheduledtaskpage.js b/src/controllers/scheduledtaskpage.js
index 7dae03cb3d..7a3e1dbcd6 100644
--- a/src/controllers/scheduledtaskpage.js
+++ b/src/controllers/scheduledtaskpage.js
@@ -92,13 +92,13 @@ define(["jQuery", "loading", "datetime", "dom", "globalize", "emby-input", "emby
 
                 var hours = trigger.IntervalTicks / 36e9;
 
-                if (hours == .25) {
+                if (hours == 0.25) {
                     return "Every 15 minutes";
                 }
-                if (hours == .5) {
+                if (hours == 0.5) {
                     return "Every 30 minutes";
                 }
-                if (hours == .75) {
+                if (hours == 0.75) {
                     return "Every 45 minutes";
                 }
                 if (hours == 1) {
diff --git a/src/controllers/scheduledtaskspage.js b/src/controllers/scheduledtaskspage.js
index bbc2d24317..87297dbcf3 100644
--- a/src/controllers/scheduledtaskspage.js
+++ b/src/controllers/scheduledtaskspage.js
@@ -137,7 +137,8 @@ define(["jQuery", "loading", "events", "globalize", "serverNotifications", "huma
             pollInterval && clearInterval(pollInterval);
         }
 
-        var pollInterval, serverId = ApiClient.serverId();
+        var pollInterval;
+        var serverId = ApiClient.serverId();
 
         $(".divScheduledTasks", view).on("click", ".btnStartTask", function() {
             var button = this;
diff --git a/src/controllers/selectserver.js b/src/controllers/selectserver.js
index 255f685572..b0ee5673e0 100644
--- a/src/controllers/selectserver.js
+++ b/src/controllers/selectserver.js
@@ -8,7 +8,7 @@ define(["loading", "appRouter", "layoutManager", "appSettings", "apphost", "focu
             return {
                 name: server.Name,
                 showIcon: true,
-                icon: "&#xE307;",
+                icon: "cast",
                 cardType: "",
                 id: server.Id,
                 server: server
diff --git a/src/controllers/shows/episodes.js b/src/controllers/shows/episodes.js
index 42d9d89f7a..9c61ac80d8 100644
--- a/src/controllers/shows/episodes.js
+++ b/src/controllers/shows/episodes.js
@@ -144,6 +144,10 @@ define(["loading", "events", "libraryBrowser", "imageLoader", "listView", "cardB
                 libraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
                 loading.hide();
                 isLoading = false;
+
+                require(["autoFocuser"], function (autoFocuser) {
+                    autoFocuser.autoFocus(page);
+                });
             });
         }
 
diff --git a/src/controllers/shows/tvgenres.js b/src/controllers/shows/tvgenres.js
index 956b8fa6fa..b6fa54f213 100644
--- a/src/controllers/shows/tvgenres.js
+++ b/src/controllers/shows/tvgenres.js
@@ -141,7 +141,7 @@ define(["layoutManager", "loading", "libraryBrowser", "cardBuilder", "lazyLoader
                     html += '<h2 class="sectionTitle sectionTitle-cards">';
                     html += item.Name;
                     html += "</h2>";
-                    html += '<i class="md-icon hide">&#xE5CC;</i>';
+                    html += '<i class="md-icon hide">chevron_right</i>';
                     html += "</a>";
                     html += "</div>";
                     if (enableScrollX()) {
diff --git a/src/controllers/shows/tvlatest.js b/src/controllers/shows/tvlatest.js
index 2a1ed56bf4..5862fce45d 100644
--- a/src/controllers/shows/tvlatest.js
+++ b/src/controllers/shows/tvlatest.js
@@ -40,6 +40,10 @@ define(["loading", "components/groupedcards", "cardBuilder", "apphost", "imageLo
             elem.innerHTML = html;
             imageLoader.lazyChildren(elem);
             loading.hide();
+
+            require(["autoFocuser"], function (autoFocuser) {
+                autoFocuser.autoFocus(context);
+            });
         });
     }
 
diff --git a/src/controllers/shows/tvrecommended.js b/src/controllers/shows/tvrecommended.js
index 1386e76a31..d1adb04342 100644
--- a/src/controllers/shows/tvrecommended.js
+++ b/src/controllers/shows/tvrecommended.js
@@ -97,6 +97,10 @@ define(["events", "inputManager", "libraryMenu", "layoutManager", "loading", "do
                     cardLayout: false
                 });
                 loading.hide();
+
+                require(["autoFocuser"], function (autoFocuser) {
+                    autoFocuser.autoFocus(view);
+                });
             });
         }
 
diff --git a/src/controllers/shows/tvshows.js b/src/controllers/shows/tvshows.js
index adccd98234..1dec530540 100644
--- a/src/controllers/shows/tvshows.js
+++ b/src/controllers/shows/tvshows.js
@@ -172,6 +172,10 @@ define(["layoutManager", "loading", "events", "libraryBrowser", "imageLoader", "
                 libraryBrowser.saveQueryValues(getSavedQueryKey(page), query);
                 loading.hide();
                 isLoading = false;
+
+                require(["autoFocuser"], function (autoFocuser) {
+                    autoFocuser.autoFocus(page);
+                });
             });
         }
 
diff --git a/src/controllers/shows/tvstudios.js b/src/controllers/shows/tvstudios.js
index 3c000a8e72..4e715e1fd7 100644
--- a/src/controllers/shows/tvstudios.js
+++ b/src/controllers/shows/tvstudios.js
@@ -46,6 +46,10 @@ define(["loading", "libraryBrowser", "cardBuilder", "apphost"], function (loadin
                 context: "tvshows"
             });
             loading.hide();
+
+            require(["autoFocuser"], function (autoFocuser) {
+                autoFocuser.autoFocus(context);
+            });
         });
     }
 
diff --git a/src/controllers/shows/tvupcoming.js b/src/controllers/shows/tvupcoming.js
index 162e6fcb34..f85278195f 100644
--- a/src/controllers/shows/tvupcoming.js
+++ b/src/controllers/shows/tvupcoming.js
@@ -57,7 +57,9 @@ define(["layoutManager", "loading", "datetime", "libraryBrowser", "cardBuilder",
                         month: "short",
                         day: "numeric"
                     });
-                } catch (err) {}
+                } catch (err) {
+                    console.log('error parsing timestamp for upcoming tv shows');
+                }
             }
 
             if (dateText != currentGroupName) {
diff --git a/src/controllers/user/display.js b/src/controllers/user/display.js
index f91e874a89..f348f28750 100644
--- a/src/controllers/user/display.js
+++ b/src/controllers/user/display.js
@@ -1,4 +1,4 @@
-define(["displaySettings", "userSettingsBuilder", "userSettings"], function (DisplaySettings, userSettingsBuilder, currentUserSettings) {
+define(["displaySettings", "userSettingsBuilder", "userSettings", "autoFocuser"], function (DisplaySettings, userSettingsBuilder, currentUserSettings, autoFocuser) {
     "use strict";
 
     return function (view, params) {
@@ -24,7 +24,8 @@ define(["displaySettings", "userSettingsBuilder", "userSettings"], function (Dis
                     element: view.querySelector(".settingsContainer"),
                     userSettings: userSettings,
                     enableSaveButton: false,
-                    enableSaveConfirmation: false
+                    enableSaveConfirmation: false,
+                    autoFocus: autoFocuser.isEnabled()
                 });
             }
         });
diff --git a/src/controllers/user/home.js b/src/controllers/user/home.js
index 5794d58723..7f12efc7fb 100644
--- a/src/controllers/user/home.js
+++ b/src/controllers/user/home.js
@@ -1,4 +1,4 @@
-define(["homescreenSettings", "userSettingsBuilder", "dom", "globalize", "loading", "userSettings", "listViewStyle"], function (HomescreenSettings, userSettingsBuilder, dom, globalize, loading, currentUserSettings) {
+define(["homescreenSettings", "userSettingsBuilder", "dom", "globalize", "loading", "userSettings", "autoFocuser", "listViewStyle"], function (HomescreenSettings, userSettingsBuilder, dom, globalize, loading, currentUserSettings, autoFocuser) {
     "use strict";
 
     return function (view, params) {
@@ -24,7 +24,8 @@ define(["homescreenSettings", "userSettingsBuilder", "dom", "globalize", "loadin
                     element: view.querySelector(".homeScreenSettingsContainer"),
                     userSettings: userSettings,
                     enableSaveButton: false,
-                    enableSaveConfirmation: false
+                    enableSaveConfirmation: false,
+                    autoFocus: autoFocuser.isEnabled()
                 });
             }
         });
diff --git a/src/controllers/user/menu.js b/src/controllers/user/menu.js
index d9fa2ab998..4e0a7824b7 100644
--- a/src/controllers/user/menu.js
+++ b/src/controllers/user/menu.js
@@ -35,6 +35,10 @@ define(["apphost", "connectionManager", "listViewStyle", "emby-button"], functio
                     page.querySelector(".adminSection").classList.add("hide");
                 }
             });
+
+            require(["autoFocuser"], function (autoFocuser) {
+                autoFocuser.autoFocus(view);
+            });
         });
     };
 });
diff --git a/src/controllers/user/playback.js b/src/controllers/user/playback.js
index f2463ad8df..3def9d1931 100644
--- a/src/controllers/user/playback.js
+++ b/src/controllers/user/playback.js
@@ -1,4 +1,4 @@
-define(["playbackSettings", "userSettingsBuilder", "dom", "globalize", "loading", "userSettings", "listViewStyle"], function (PlaybackSettings, userSettingsBuilder, dom, globalize, loading, currentUserSettings) {
+define(["playbackSettings", "userSettingsBuilder", "dom", "globalize", "loading", "userSettings", "autoFocuser", "listViewStyle"], function (PlaybackSettings, userSettingsBuilder, dom, globalize, loading, currentUserSettings, autoFocuser) {
     "use strict";
 
     return function (view, params) {
@@ -24,7 +24,8 @@ define(["playbackSettings", "userSettingsBuilder", "dom", "globalize", "loading"
                     element: view.querySelector(".settingsContainer"),
                     userSettings: userSettings,
                     enableSaveButton: false,
-                    enableSaveConfirmation: false
+                    enableSaveConfirmation: false,
+                    autoFocus: autoFocuser.isEnabled()
                 });
             }
         });
diff --git a/src/controllers/user/subtitles.js b/src/controllers/user/subtitles.js
index 205265efcd..1f1102194e 100644
--- a/src/controllers/user/subtitles.js
+++ b/src/controllers/user/subtitles.js
@@ -1,4 +1,4 @@
-define(["subtitleSettings", "userSettingsBuilder", "userSettings"], function (SubtitleSettings, userSettingsBuilder, currentUserSettings) {
+define(["subtitleSettings", "userSettingsBuilder", "userSettings", "autoFocuser"], function (SubtitleSettings, userSettingsBuilder, currentUserSettings, autoFocuser) {
     "use strict";
 
     return function (view, params) {
@@ -24,7 +24,8 @@ define(["subtitleSettings", "userSettingsBuilder", "userSettings"], function (Su
                     element: view.querySelector(".settingsContainer"),
                     userSettings: userSettings,
                     enableSaveButton: false,
-                    enableSaveConfirmation: false
+                    enableSaveConfirmation: false,
+                    autoFocus: autoFocuser.isEnabled()
                 });
             }
         });
diff --git a/src/controllers/userpasswordpage.js b/src/controllers/userpasswordpage.js
index 30ca063278..eeb9b25e3e 100644
--- a/src/controllers/userpasswordpage.js
+++ b/src/controllers/userpasswordpage.js
@@ -47,6 +47,10 @@ define(["loading", "libraryMenu", "emby-button"], function (loading, libraryMenu
                 }
 
                 page.querySelector(".chkEnableLocalEasyPassword").checked = user.Configuration.EnableLocalPassword;
+
+                require(["autoFocuser"], function (autoFocuser) {
+                    autoFocuser.autoFocus(page);
+                });
             });
         });
         page.querySelector("#txtCurrentPassword").value = "";
diff --git a/src/controllers/userprofilespage.js b/src/controllers/userprofilespage.js
index 3c22ff3cbf..7aeea9cb28 100644
--- a/src/controllers/userprofilespage.js
+++ b/src/controllers/userprofilespage.js
@@ -27,22 +27,22 @@ define(["loading", "dom", "globalize", "humanedate", "paper-icon-button-light",
         menuItems.push({
             name: globalize.translate("ButtonOpen"),
             id: "open",
-            ironIcon: "mode-edit"
+            icon: "mode_edit"
         });
         menuItems.push({
             name: globalize.translate("ButtonLibraryAccess"),
             id: "access",
-            ironIcon: "lock"
+            icon: "lock"
         });
         menuItems.push({
             name: globalize.translate("ButtonParentalControl"),
             id: "parentalcontrol",
-            ironIcon: "person"
+            icon: "person"
         });
         menuItems.push({
             name: globalize.translate("ButtonDelete"),
             id: "delete",
-            ironIcon: "delete"
+            icon: "delete"
         });
 
         require(["actionsheet"], function (actionsheet) {
@@ -149,7 +149,7 @@ define(["loading", "dom", "globalize", "humanedate", "paper-icon-button-light",
         menuItems.push({
             name: globalize.translate("ButtonCancel"),
             id: "delete",
-            ironIcon: "delete"
+            icon: "delete"
         });
 
         require(["actionsheet"], function (actionsheet) {
@@ -181,7 +181,7 @@ define(["loading", "dom", "globalize", "humanedate", "paper-icon-button-light",
             html += '<div class="cardImage" style="background-image:url(\'' + user.ImageUrl + "');\">";
             html += "</div>";
         } else {
-            html += '<i class="cardImageIcon md-icon">&#xE7FD;</i>';
+            html += '<i class="cardImageIcon md-icon">person</i>';
         }
 
         html += "</a>";
diff --git a/src/controllers/videoosd.js b/src/controllers/videoosd.js
index 6232c1f2e0..23b643aa77 100644
--- a/src/controllers/videoosd.js
+++ b/src/controllers/videoosd.js
@@ -467,34 +467,34 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
 
             switch (e.detail.command) {
                 case "left":
-                if ("osd" === currentVisibleMenu) {
-                    showOsd();
-                } else {
-                    if (!currentVisibleMenu) {
-                        e.preventDefault();
-                        playbackManager.rewind(player);
+                    if ("osd" === currentVisibleMenu) {
+                        showOsd();
+                    } else {
+                        if (!currentVisibleMenu) {
+                            e.preventDefault();
+                            playbackManager.rewind(player);
+                        }
                     }
-                }
 
-                break;
+                    break;
 
                 case "right":
-                if ("osd" === currentVisibleMenu) {
-                    showOsd();
-                } else if (!currentVisibleMenu) {
-                    e.preventDefault();
-                    playbackManager.fastForward(player);
-                }
+                    if ("osd" === currentVisibleMenu) {
+                        showOsd();
+                    } else if (!currentVisibleMenu) {
+                        e.preventDefault();
+                        playbackManager.fastForward(player);
+                    }
 
-                break;
+                    break;
 
                 case "pageup":
-                playbackManager.nextChapter(player);
-                break;
+                    playbackManager.nextChapter(player);
+                    break;
 
                 case "pagedown":
-                playbackManager.previousChapter(player);
-                break;
+                    playbackManager.previousChapter(player);
+                    break;
 
                 case "up":
                 case "down":
@@ -508,16 +508,16 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
                 case "rewind":
                 case "next":
                 case "previous":
-                showOsd();
-                break;
+                    showOsd();
+                    break;
 
                 case "record":
-                onRecordingCommand();
-                showOsd();
-                break;
+                    onRecordingCommand();
+                    showOsd();
+                    break;
 
                 case "togglestats":
-                toggleStats();
+                    toggleStats();
             }
         }
 
@@ -532,10 +532,10 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
         function updateFullscreenIcon() {
             if (playbackManager.isFullscreen(currentPlayer)) {
                 view.querySelector(".btnFullscreen").setAttribute("title", globalize.translate("ExitFullscreen"));
-                view.querySelector(".btnFullscreen i").innerHTML = "&#xE5D1;";
+                view.querySelector(".btnFullscreen i").innerHTML = "fullscreen_exit";
             } else {
                 view.querySelector(".btnFullscreen").setAttribute("title", globalize.translate("Fullscreen") + " (f)");
-                view.querySelector(".btnFullscreen i").innerHTML = "&#xE5D0;";
+                view.querySelector(".btnFullscreen i").innerHTML = "fullscreen";
             }
         }
 
@@ -734,10 +734,10 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
         function updatePlayPauseState(isPaused) {
             var button = view.querySelector(".btnPause i");
             if (isPaused) {
-                button.innerHTML = "&#xE037;";
+                button.innerHTML = "play_arrow";
                 button.setAttribute("title", globalize.translate("ButtonPlay") + " (k)");
             } else {
-                button.innerHTML = "&#xE034;";
+                button.innerHTML = "pause";
                 button.setAttribute("title", globalize.translate("ButtonPause") + " (k)");
             }
         }
@@ -852,7 +852,6 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
             var volumeSlider = view.querySelector('.osdVolumeSliderContainer');
             var progressElement = volumeSlider.querySelector('.mdl-slider-background-lower');
 
-
             if (-1 === supportedCommands.indexOf("Mute")) {
                 showMuteButton = false;
             }
@@ -868,10 +867,10 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
 
             if (isMuted) {
                 view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Unmute") + " (m)");
-                view.querySelector(".buttonMute i").innerHTML = "&#xE04F;";
+                view.querySelector(".buttonMute i").innerHTML = "volume_off";
             } else {
                 view.querySelector(".buttonMute").setAttribute("title", globalize.translate("Mute") + " (m)");
-                view.querySelector(".buttonMute i").innerHTML = "&#xE050;";
+                view.querySelector(".buttonMute i").innerHTML = "volume_up";
             }
 
             if (progressElement) {
@@ -1062,7 +1061,7 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
                 var player = currentPlayer;
                 if (subtitleSyncOverlay) {
                     subtitleSyncOverlay.toggle(action);
-                } else if(player){
+                } else if (player) {
                     subtitleSyncOverlay = new SubtitleSync(player);
                 }
             });
@@ -1096,52 +1095,52 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
                 case "k":
                     playbackManager.playPause(currentPlayer);
                     showOsd();
-                break;
+                    break;
 
                 case "l":
                 case "ArrowRight":
                 case "Right":
                     playbackManager.fastForward(currentPlayer);
                     showOsd();
-                break;
+                    break;
 
                 case "j":
                 case "ArrowLeft":
                 case "Left":
                     playbackManager.rewind(currentPlayer);
                     showOsd();
-                break;
+                    break;
 
                 case "f":
-                if (!e.ctrlKey && !e.metaKey) {
-                    playbackManager.toggleFullscreen(currentPlayer);
-                    showOsd();
-                }
-                break;
+                    if (!e.ctrlKey && !e.metaKey) {
+                        playbackManager.toggleFullscreen(currentPlayer);
+                        showOsd();
+                    }
+                    break;
 
                 case "m":
-                playbackManager.toggleMute(currentPlayer);
-                showOsd();
-                break;
+                    playbackManager.toggleMute(currentPlayer);
+                    showOsd();
+                    break;
 
                 case "NavigationLeft":
                 case "GamepadDPadLeft":
                 case "GamepadLeftThumbstickLeft":
                 // Ignores gamepad events that are always triggered, even when not focused.
-                if (document.hasFocus()) {
-                    playbackManager.rewind(currentPlayer);
-                    showOsd();
-                }
-                break;
+                    if (document.hasFocus()) {
+                        playbackManager.rewind(currentPlayer);
+                        showOsd();
+                    }
+                    break;
 
                 case "NavigationRight":
                 case "GamepadDPadRight":
                 case "GamepadLeftThumbstickRight":
                 // Ignores gamepad events that are always triggered, even when not focused.
-                if (document.hasFocus()) {
-                    playbackManager.fastForward(currentPlayer);
-                    showOsd();
-                }
+                    if (document.hasFocus()) {
+                        playbackManager.fastForward(currentPlayer);
+                        showOsd();
+                    }
             }
         }
 
@@ -1275,7 +1274,7 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
                 dom.addEventListener(window, "keydown", onWindowKeyDown, {
                     passive: true
                 });
-            } catch(e) {
+            } catch (e) {
                 require(['appRouter'], function(appRouter) {
                     appRouter.showDirect('/');
                 });
@@ -1334,24 +1333,24 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
 
             switch (pointerType) {
                 case "touch":
-                if (now - lastPointerDown > 300) {
-                    lastPointerDown = now;
-                    toggleOsd();
-                }
+                    if (now - lastPointerDown > 300) {
+                        lastPointerDown = now;
+                        toggleOsd();
+                    }
 
-                break;
+                    break;
 
                 case "mouse":
-                if (!e.button) {
-                    playbackManager.playPause(currentPlayer);
-                    showOsd();
-                }
+                    if (!e.button) {
+                        playbackManager.playPause(currentPlayer);
+                        showOsd();
+                    }
 
-                break;
+                    break;
 
                 default:
-                playbackManager.playPause(currentPlayer);
-                showOsd();
+                    playbackManager.playPause(currentPlayer);
+                    showOsd();
             }
         }, {
             passive: true
@@ -1361,14 +1360,16 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
             dom.addEventListener(view, "dblclick", onDoubleClick, {});
         } else {
             var options = { passive: true };
-            dom.addEventListener(view, "dblclick", function () { playbackManager.toggleFullscreen(currentPlayer); }, options);
+            dom.addEventListener(view, "dblclick", function () {
+                playbackManager.toggleFullscreen(currentPlayer);
+            }, options);
         }
 
         view.querySelector(".buttonMute").addEventListener("click", function () {
             playbackManager.toggleMute(currentPlayer);
         });
         nowPlayingVolumeSlider.addEventListener("change", function () {
-            if(volumeSliderTimer){
+            if (volumeSliderTimer) {
                 // interupt and remove existing timer
                 clearTimeout(volumeSliderTimer);
                 volumeSliderTimer = null;
@@ -1376,10 +1377,10 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
             playbackManager.setVolume(this.value, currentPlayer);
         });
         nowPlayingVolumeSlider.addEventListener("mousemove", function () {
-            if(!volumeSliderTimer){
+            if (!volumeSliderTimer) {
                 var that = this;
                 // register new timer
-                volumeSliderTimer = setTimeout(function(){
+                volumeSliderTimer = setTimeout(function() {
                     playbackManager.setVolume(that.value, currentPlayer);
                     // delete timer after completion
                     volumeSliderTimer = null;
@@ -1387,10 +1388,10 @@ define(["playbackManager", "dom", "inputManager", "datetime", "itemHelper", "med
             }
         });
         nowPlayingVolumeSlider.addEventListener("touchmove", function () {
-            if(!volumeSliderTimer){
+            if (!volumeSliderTimer) {
                 var that = this;
                 // register new timer
-                volumeSliderTimer = setTimeout(function(){
+                volumeSliderTimer = setTimeout(function() {
                     playbackManager.setVolume(that.value, currentPlayer);
                     // delete timer after completion
                     volumeSliderTimer = null;
diff --git a/src/dashboard.html b/src/dashboard.html
index 67d269db3d..43a081f8db 100644
--- a/src/dashboard.html
+++ b/src/dashboard.html
@@ -5,7 +5,7 @@
                 <div class="dashboardSection" style="padding-left: 0;">
                     <a is="emby-linkbutton" href="dashboardgeneral.html" class="button-flat sectionTitleTextButton">
                         <h3>${TabServer}</h3>
-                        <i class="md-icon">&#xE5CC;</i>
+                        <i class="md-icon">chevron_right</i>
                     </a>
 
                     <div class="paperList" style="padding: 1em;">
@@ -34,7 +34,7 @@
                 <div class="dashboardSection" style="padding-left: 0;">
                     <a is="emby-linkbutton" href="devices.html" class="button-flat sectionTitleTextButton">
                         <h3>${HeaderActiveDevices}</h3>
-                        <i class="md-icon">&#xE5CC;</i>
+                        <i class="md-icon">chevron_right</i>
                     </a>
                     <div class="activeDevices itemsContainer vertical-wrap">
                     </div>
@@ -45,7 +45,7 @@
                 <div class="dashboardSection">
                     <a is="emby-linkbutton" href="serveractivity.html?useractivity=true" class="button-flat sectionTitleTextButton">
                         <h3>${HeaderActivity}</h3>
-                        <i class="md-icon">&#xE5CC;</i>
+                        <i class="md-icon">chevron_right</i>
                     </a>
                     <div class="paperList userActivityItems" data-activitylimit="7" data-useractivity="true">
                     </div>
@@ -62,7 +62,7 @@
                 <div class="dashboardSection serverActivitySection hide activityContainer">
                     <a is="emby-linkbutton" href="serveractivity.html?useractivity=false" class="button-flat sectionTitleTextButton">
                         <h3>${Alerts}</h3>
-                        <i class="md-icon">&#xE5CC;</i>
+                        <i class="md-icon">chevron_right</i>
                     </a>
                     <div class="paperList serverActivityItems" data-activitylimit="4" data-useractivity="false">
                     </div>
@@ -71,7 +71,7 @@
                 <div class="dashboardSection">
                     <a is="emby-linkbutton" href="dashboardgeneral.html" class="button-flat sectionTitleTextButton">
                         <h3>${HeaderPaths}</h3>
-                        <i class="md-icon">&#xE5CC;</i>
+                        <i class="md-icon">chevron_right</i>
                     </a>
                     <div class="paperList">
                         <div class="listItem listItem-border">
diff --git a/src/dlnaprofile.html b/src/dlnaprofile.html
index 3c2ff16707..2054bce3db 100644
--- a/src/dlnaprofile.html
+++ b/src/dlnaprofile.html
@@ -98,7 +98,7 @@
                             <div>
                                 <h2 style="vertical-align:middle;display:inline-block;">${HeaderHttpHeaders}</h2>
                                 <button is="emby-button" type="button" class="fab btnAddIdentificationHttpHeader submit sectionTitleButton" style="margin-left:1em;" title="${ButtonAdd}">
-                                    <i class="md-icon">&#xE145;</i>
+                                    <i class="md-icon">add</i>
                                 </button>
                             </div>
                             <div class="httpHeaderIdentificationList"></div>
@@ -221,7 +221,7 @@
                             <div>
                                 <h2 style="vertical-align:middle;display:inline-block;">${HeaderXmlDocumentAttributes}</h2>
                                 <button is="emby-button" type="button" class="fab btnAddXmlDocumentAttribute submit sectionTitleButton" style="margin-left:1em;" title="${ButtonAdd}">
-                                    <i class="md-icon">&#xE145;</i>
+                                    <i class="md-icon">add</i>
                                 </button>
                             </div>
                             <div class="xmlDocumentAttributeList"></div>
diff --git a/src/dlnaprofiles.html b/src/dlnaprofiles.html
index ef1c353d46..ac9e961370 100644
--- a/src/dlnaprofiles.html
+++ b/src/dlnaprofiles.html
@@ -9,7 +9,7 @@
                     <div class="sectionTitleContainer flex align-items-center">
                         <h2 class="sectionTitle">${HeaderCustomDlnaProfiles}</h2>
                         <a is="emby-linkbutton" href="dlnaprofile.html" class="fab submit" style="margin:0 0 0 1em">
-                            <i class="md-icon">&#xE145;</i>
+                            <i class="md-icon">add</i>
                         </a>
                         <a style="margin-left:2em!important;" is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://web.archive.org/web/20181216120305/https://github.com/MediaBrowser/Wiki/wiki/Dlna-profiles">${Help}</a>
                     </div>
@@ -30,4 +30,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/itemdetails.html b/src/itemdetails.html
index 7025a7ff37..2a29cce96b 100644
--- a/src/itemdetails.html
+++ b/src/itemdetails.html
@@ -12,7 +12,7 @@
     <div id="itemBackdrop" class="itemBackdrop noBackdrop">
         <div class="itemBackdropFader">
         </div>
-        <button is="emby-button" type="button" class="btnPlay detailFloatingButton hide fab autoSize" title="${ButtonPlay}" data-mode="resume"><i class="md-icon">&#xE037;</i></button>
+        <button is="emby-button" type="button" class="btnPlay detailFloatingButton hide fab autoSize" title="${ButtonPlay}" data-mode="resume"><i class="md-icon">play_arrow</i></button>
     </div>
 
     <div class="detailLogo"></div>
@@ -77,7 +77,7 @@
 
                         <button is="emby-button" type="button" class="button-flat btnDownload hide detailButton-mobile">
                             <div class="detailButton-mobile-content">
-                                <i class="md-icon detailButton-mobile-icon">&#xe884;</i>
+                                <i class="md-icon detailButton-mobile-icon">get_app</i>
                                 <div class="detailButton-mobile-text">${ButtonDownload}</div>
                             </div>
                         </button>
@@ -88,7 +88,7 @@
 
                         <button is="emby-button" type="button" class="button-flat btnPlayTrailer hide detailButton-mobile">
                             <div class="detailButton-mobile-content">
-                                <i class="md-icon detailButton-mobile-icon">&#xE8DA;</i>
+                                <i class="md-icon detailButton-mobile-icon">theaters</i>
                                 <div class="detailButton-mobile-text">${ButtonTrailer}</div>
                             </div>
                         </button>
@@ -99,7 +99,7 @@
 
                         <button is="emby-button" type="button" class="button-flat btnInstantMix hide detailButton-mobile">
                             <div class="detailButton-mobile-content">
-                                <i class="md-icon detailButton-mobile-icon">&#xE043;</i>
+                                <i class="md-icon detailButton-mobile-icon">shuffle</i>
                                 <div class="detailButton-mobile-text">${HeaderInstantMix}</div>
                             </div>
                         </button>
@@ -110,7 +110,7 @@
 
                         <button is="emby-button" type="button" class="button-flat btnShuffle hide detailButton-mobile">
                             <div class="detailButton-mobile-content">
-                                <i class="md-icon detailButton-mobile-icon">&#xE043;</i>
+                                <i class="md-icon detailButton-mobile-icon">shuffle</i>
                                 <div class="detailButton-mobile-text">${ButtonShuffle}</div>
                             </div>
                         </button>
@@ -121,7 +121,7 @@
 
                         <button is="emby-button" type="button" class="button-flat btnCancelSeriesTimer hide detailButton-mobile">
                             <div class="detailButton-mobile-content">
-                                <i class="md-icon detailButton-mobile-icon">&#xE872;</i>
+                                <i class="md-icon detailButton-mobile-icon">delete</i>
                                 <div class="detailButton-mobile-text">${CancelSeries}</div>
                             </div>
                         </button>
@@ -132,7 +132,7 @@
 
                         <button is="emby-button" type="button" class="button-flat btnCancelTimer hide detailButton-mobile">
                             <div class="detailButton-mobile-content">
-                                <i class="md-icon detailButton-mobile-icon">&#xE047;</i>
+                                <i class="md-icon detailButton-mobile-icon">stop</i>
                                 <div class="detailButton-mobile-text">${StopRecording}</div>
                             </div>
                         </button>
@@ -143,39 +143,39 @@
 
                         <button is="emby-button" type="button" class="button-flat btnDeleteItem hide detailButton-mobile">
                             <div class="detailButton-mobile-content">
-                                <i class="md-icon detailButton-mobile-icon">&#xE872;</i>
+                                <i class="md-icon detailButton-mobile-icon">delete</i>
                                 <div class="detailButton-mobile-text">${Delete}</div>
                             </div>
                         </button>
 
                         <button is="emby-button" type="button" class="fab btnDeleteItem hide detailButton">
-                            <i class="md-icon">&#xE872;</i>
+                            <i class="md-icon">delete</i>
                         </button>
 
                         <button is="emby-playstatebutton" type="button" class="button-flat btnPlaystate hide detailButton-mobile">
                             <div class="detailButton-mobile-content">
-                                <i class="md-icon detailButton-mobile-icon">&#xE5CA;</i>
+                                <i class="md-icon detailButton-mobile-icon">check</i>
                                 <div class="detailButton-mobile-text button-text"></div>
                             </div>
                         </button>
 
                         <button is="emby-playstatebutton" type="button" class="fab btnPlaystate hide detailButton">
-                            <i class="md-icon">&#xE5CA;</i>
+                            <i class="md-icon">check</i>
                         </button>
 
                         <button is="emby-ratingbutton" type="button" class="button-flat btnUserRating hide detailButton-mobile">
                             <div class="detailButton-mobile-content">
-                                <i class="md-icon detailButton-mobile-icon">&#xE87D;</i>
+                                <i class="md-icon detailButton-mobile-icon">favorite</i>
                                 <div class="detailButton-mobile-text button-text">${Rate}</div>
                             </div>
                         </button>
 
                         <button is="emby-ratingbutton" type="button" class="fab btnUserRating hide detailButton">
-                            <i class="md-icon">&#xE87D;</i>
+                            <i class="md-icon">favorite</i>
                         </button>
 
                         <button is="emby-button" type="button" class="fab btnSplitVersions hide  detailButton">
-                            <i class="md-icon">&#xe0b6;</i>
+                            <i class="md-icon">call_split</i>
                         </button>
 
                         <button is="emby-button" type="button" class="button-flat btnMoreCommands hide detailButton-mobile">
@@ -186,7 +186,7 @@
                         </button>
 
                         <button is="emby-button" type="button" class="fab btnMoreCommands hide detailButton">
-                            <i class="md-icon">&#xE5D3;</i>
+                            <i class="md-icon">more_horiz</i>
                         </button>
                     </div>
 
diff --git a/src/list.html b/src/list.html
index 5161704249..e31efa27e6 100644
--- a/src/list.html
+++ b/src/list.html
@@ -7,48 +7,48 @@
                 <span>${HeaderPlayAll}</span>
             </button>
             <button is="paper-icon-button-light" class="btnPlay listIconButton-autohide">
-                <i class="md-icon">&#xE037;</i>
+                <i class="md-icon">play_arrow</i>
             </button>
             <button is="emby-button" class="btnQueue button-flat hide listTextButton-autohide">
                 <span>${Queue}</span>
             </button>
             <button is="paper-icon-button-light" class="btnQueue hide listIconButton-autohide">
-                <i class="md-icon">&#xE03B;</i>
+                <i class="md-icon">playlist_add</i>
             </button>
             <button is="emby-button" class="btnShuffle button-flat hide listTextButton-autohide">
                 <span>${Shuffle}</span>
             </button>
             <button is="paper-icon-button-light" class="btnShuffle hide listIconButton-autohide">
-                <i class="md-icon">&#xE043;</i>
+                <i class="md-icon">shuffle</i>
             </button>
             <button is="emby-button" class="btnNewItem hide button-flat listTextButton-autohide">
                 <span>${New}</span>
             </button>
             <button is="paper-icon-button-light" class="btnNewItem hide listIconButton-autohide">
-                <i class="md-icon">&#xE145;</i>
+                <i class="md-icon">add</i>
             </button>
 
             <button is="emby-button" class="btnSort hide button-flat listTextButton-autohide">
                 <span class="btnSortText"></span>
-                <i class="md-icon btnSortIcon">&#xE5D8;</i>
+                <i class="md-icon btnSortIcon">arrow_upward</i>
             </button>
             <button is="paper-icon-button-light" class="btnSort hide listIconButton-autohide">
-                <i class="md-icon">&#xE164;</i>
+                <i class="md-icon">sort</i>
             </button>
             <button is="emby-button" class="btnFilter button-flat listTextButton-autohide">
                 <span>${Filter}</span>
             </button>
             <button is="paper-icon-button-light" class="btnFilter listIconButton-autohide" data-ripple="false" style="overflow:visible;">
-                <i class="md-icon">&#xE152;</i>
+                <i class="md-icon">filter_list</i>
             </button>
             <button is="emby-button" class="btnViewSettings button-flat listTextButton-autohide">
-                <i class="md-icon">&#xE5D3;</i>
+                <i class="md-icon">more_horiz</i>
             </button>
             <button is="paper-icon-button-light" class="btnViewSettings listIconButton-autohide">
-                <i class="md-icon">&#xE5D3;</i>
+                <i class="md-icon">more_horiz</i>
             </button>
         </div>
         <div is="emby-itemscontainer" class="vertical-wrap itemsContainer centered" style="padding: 0 0 10vh 0;">
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/livetv.html b/src/livetv.html
index 2bc99b2b80..2ff8990e4a 100644
--- a/src/livetv.html
+++ b/src/livetv.html
@@ -7,7 +7,7 @@
                 <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
                     <a href="list.html?type=Programs&IsAiring=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
                         <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${HeaderOnNow}</h2>
-                        <i class="md-icon">&#xE5CC;</i>
+                        <i class="md-icon">chevron_right</i>
                     </a>
                 </div>
                 <div is="emby-itemscontainer" class="activeProgramItems itemsContainer padded-left padded-right"></div>
@@ -16,7 +16,7 @@
                 <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
                     <a href="list.html?type=Programs&IsSeries=true&IsMovie=false&IsNews=false" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
                         <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${TabShows}</h2>
-                        <i class="md-icon">&#xE5CC;</i>
+                        <i class="md-icon">chevron_right</i>
                     </a>
                 </div>
                 <div is="emby-itemscontainer" class="upcomingEpisodeItems itemsContainer padded-left padded-right"></div>
@@ -25,7 +25,7 @@
                 <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
                     <a href="list.html?type=Programs&IsMovie=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
                         <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${HeaderMovies}</h2>
-                        <i class="md-icon">&#xE5CC;</i>
+                        <i class="md-icon">chevron_right</i>
                     </a>
                 </div>
                 <div is="emby-itemscontainer" class="upcomingTvMovieItems itemsContainer padded-left padded-right"></div>
@@ -34,7 +34,7 @@
                 <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
                     <a href="list.html?type=Programs&IsSports=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
                         <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${Sports}</h2>
-                        <i class="md-icon">&#xE5CC;</i>
+                        <i class="md-icon">chevron_right</i>
                     </a>
                 </div>
                 <div is="emby-itemscontainer" class="upcomingSportsItems itemsContainer padded-left padded-right"></div>
@@ -43,7 +43,7 @@
                 <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
                     <a href="list.html?type=Programs&IsKids=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
                         <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${HeaderForKids}</h2>
-                        <i class="md-icon">&#xE5CC;</i>
+                        <i class="md-icon">chevron_right</i>
                     </a>
                 </div>
                 <div is="emby-itemscontainer" class="upcomingKidsItems itemsContainer padded-left padded-right"></div>
@@ -52,7 +52,7 @@
                 <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
                     <a href="list.html?type=Programs&IsNews=true" is="emby-linkbutton" class="button-flat button-flat-mini sectionTitleTextButton sectionTitleTextButton-programs">
                         <h2 class="sectionTitle sectionTitle-cards" style="display: inline-block; vertical-align: middle;">${News}</h2>
-                        <i class="md-icon">&#xE5CC;</i>
+                        <i class="md-icon">chevron_right</i>
                     </a>
                 </div>
                 <div is="emby-itemscontainer" class="upcomingNewsItems itemsContainer padded-left padded-right"></div>
@@ -72,7 +72,7 @@
                 <div class="sectionTitleContainer sectionTitleContainer-cards padded-left">
                     <button type="button" is="emby-button" class="button-flat button-flat-mini sectionTitleTextButton more" data-type="latest">
                         <h2 class="sectionTitle sectionTitle-cards">${HeaderLatestRecordings}</h2>
-                        <i class="md-icon">&#xE5CC;</i>
+                        <i class="md-icon">chevron_right</i>
                     </button>
                 </div>
                 <div is="emby-itemscontainer" class="recordingItems itemsContainer padded-left padded-right"></div>
@@ -94,4 +94,4 @@
         </div>
     </div>
 
-</div>
\ No newline at end of file
+</div>
diff --git a/src/livetvstatus.html b/src/livetvstatus.html
index 9c2c8d2c9a..3abd14de34 100644
--- a/src/livetvstatus.html
+++ b/src/livetvstatus.html
@@ -8,7 +8,7 @@
                             <span>${HeaderTunerDevices}</span>
                         </h2>
                         <button is="emby-button" type="button" class="fab btnAddDevice submit sectionTitleButton" style="margin-left:1em;" title="${ButtonAdd}">
-                            <i class="md-icon">&#xE145;</i>
+                            <i class="md-icon">add</i>
                         </button>
                         <a style="margin-left:2em!important;" is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/server/live-tv/index.html">${Help}</a>
                     </div>
@@ -21,7 +21,7 @@
                     <div class="sectionTitleContainer">
                         <h2 class="sectionTitle">${HeaderGuideProviders}</h2>
                         <button is="emby-button" type="button" class="fab btnAddProvider submit" style="margin-left:1em;" title="${ButtonAdd}">
-                            <i class="md-icon">&#xE145;</i>
+                            <i class="md-icon">add</i>
                         </button>
                     </div>
 
@@ -38,4 +38,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/music.html b/src/music.html
index d7082e04c4..e86f179208 100644
--- a/src/music.html
+++ b/src/music.html
@@ -37,8 +37,8 @@
     <div class="pageTabContent pageTabContent" id="albumsTab" data-index="1">
         <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom">
             <div class="paging"></div>
-            <button is="paper-icon-button-light" class="btnPlayAll musicglobalButton" title="${HeaderPlayAll}"><i class="md-icon">&#xE037;</i></button>
-            <button is="paper-icon-button-light" class="btnShuffle musicglobalButton" title="${ButtonShuffle}"><i class="md-icon">&#xE043;</i></button>
+            <button is="paper-icon-button-light" class="btnPlayAll musicglobalButton" title="${HeaderPlayAll}"><i class="md-icon">play_arrow</i></button>
+            <button is="paper-icon-button-light" class="btnShuffle musicglobalButton" title="${ButtonShuffle}"><i class="md-icon">shuffle</i></button>
             <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><i class="md-icon">view_comfy</i></button>
             <button is="paper-icon-button-light" class="btnSort autoSize" title="${ButtonSort}"><i class="md-icon">sort_by_alpha</i></button>
             <button is="paper-icon-button-light" class="btnFilter autoSize" title="${ButtonFilter}"><i class="md-icon">filter_list</i></button>
@@ -107,4 +107,4 @@
     </div>
     <div class="pageTabContent" data-index="7">
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/myprofile.html b/src/myprofile.html
index fdb071dde5..d30f905818 100644
--- a/src/myprofile.html
+++ b/src/myprofile.html
@@ -2,8 +2,8 @@
     <div class="padded-left padded-right padded-bottom-page">
         <div class="readOnlyContent" style="margin: 0 auto; padding: 0 1em;">
             <div style="position:relative;display:inline-block;max-width:200px;">
-                <div id="image" style="width:200px;height:200px;background-repeat:no-repeat;background-position:center;border-radius:100%;background-size:cover;"></div>
                 <input id="uploadImage" type="file" accept="image/*" style="position:absolute;right:0;width:100%;height:100%;opacity:0;" />
+                <div id="image" style="width:200px;height:200px;background-repeat:no-repeat;background-position:center;border-radius:100%;background-size:cover;"></div>
             </div>
             <div style="vertical-align:top;margin:1em 2em;display:inline-block;">
                 <h2 class="username" style="margin:0;font-size:xx-large;"></h2>
diff --git a/src/nowplaying.html b/src/nowplaying.html
index fa8ade166f..6be865d152 100644
--- a/src/nowplaying.html
+++ b/src/nowplaying.html
@@ -19,7 +19,7 @@
                     </button>
 
                     <button is="paper-icon-button-light" class="btnRewind btnNowPlayingRewind btnPlayStateCommand autoSize" title="${Rewind}">
-                        <i class="md-icon">&#xE020;</i>
+                        <i class="md-icon">fast_rewind</i>
                     </button>
 
                     <button is="paper-icon-button-light" class="btnPlayPause btnPlayStateCommand autoSize" title="${ButtonPause}">
@@ -31,7 +31,7 @@
                     </button>
 
                     <button is="paper-icon-button-light" class="btnPlayStateCommand btnFastForward btnNowPlayingFastForward autoSize" title="${FastForward}">
-                        <i class="md-icon">&#xE01F;</i>
+                        <i class="md-icon">fast_forward</i>
                     </button>
 
                     <button is="paper-icon-button-light" class="btnPlayStateCommand btnNextTrack autoSize" title="${ButtonNextTrack}">
@@ -65,7 +65,7 @@
                         </button>
 
                         <button is="paper-icon-button-light" class="buttonMute autoSize" title="${Mute}">
-                            <i class="xlargePaperIconButton md-icon">&#xE050;</i>
+                            <i class="xlargePaperIconButton md-icon">volume_up</i>
                         </button>
                         <div class="sliderContainer nowPlayingVolumeSliderContainer">
                             <input is="emby-slider" type="range" step="1" min="0" max="100" value="0" class="nowPlayingVolumeSlider" />
@@ -101,7 +101,7 @@
             </div>
             <div>
                 <button is="paper-icon-button-light" class="btnBack btnCommand autoSize" title="${ButtonBack}" data-command="Back">
-                    <i class="md-icon">&#xE5C4;</i>
+                    <i class="md-icon">arrow_back</i>
                 </button>
 
                 <button is="paper-icon-button-light" class="btnInfo btnCommand autoSize" title="${ButtonInfo}" data-command="ToggleContextMenu">
@@ -162,7 +162,7 @@
             <div style="display: flex; align-items: center;margin:2em 0 1em">
                 <h2 style="margin:0;">${TabPlaylist}</h2>
                 <button is="paper-icon-button-light" class="btnSavePlaylist" title="${ButtonSave}" style="margin-left:1em;">
-                    <i class="md-icon">&#xE161;</i>
+                    <i class="md-icon">save</i>
                 </button>
             </div>
             <div class="playlist itemsContainer vertical-list" is="emby-itemscontainer" data-dragreorder="true">
@@ -173,4 +173,4 @@
         <br />
         <br />
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/scheduledtask.html b/src/scheduledtask.html
index 9aebd9b55d..ee2a2c3420 100644
--- a/src/scheduledtask.html
+++ b/src/scheduledtask.html
@@ -16,7 +16,7 @@
                         ${HeaderTaskTriggers}
                     </h2>
                     <button is="emby-button" type="button" class="fab fab-mini btnAddTrigger submit" style="margin-left: 1em;" title="${ButtonAddScheduledTaskTrigger}">
-                        <i class="md-icon">&#xE145;</i>
+                        <i class="md-icon">add</i>
                     </button>
                 </div>
                 <div class="taskTriggers"></div>
diff --git a/src/scripts/browser.js b/src/scripts/browser.js
index a50eeaa608..66c3051c8c 100644
--- a/src/scripts/browser.js
+++ b/src/scripts/browser.js
@@ -30,7 +30,6 @@ define([], function () {
     }
 
     function isMobile(userAgent) {
-
         var terms = [
             'mobi',
             'ipad',
@@ -144,14 +143,16 @@ define([], function () {
             }
         }
 
-        var animation = false,
-            animationstring = 'animation',
-            keyframeprefix = '',
-            domPrefixes = ['Webkit', 'O', 'Moz'],
-            pfx = '',
-            elm = document.createElement('div');
+        var animation = false;
+        var animationstring = 'animation';
+        var keyframeprefix = '';
+        var domPrefixes = ['Webkit', 'O', 'Moz'];
+        var pfx = '';
+        var elm = document.createElement('div');
 
-        if (elm.style.animationName !== undefined) { animation = true; }
+        if (elm.style.animationName !== undefined) {
+            animation = true;
+        }
 
         if (animation === false && allowPrefix) {
             for (var i = 0; i < domPrefixes.length; i++) {
@@ -204,8 +205,7 @@ define([], function () {
 
                 // http://www.neowin.net/news/ie11-fakes-user-agent-to-fool-gmail-in-windows-phone-81-gdr1-update
                 browser = "msie";
-            }
-            else if (ua.indexOf("like gecko") !== -1 && ua.indexOf('webkit') === -1 && ua.indexOf('opera') === -1 && ua.indexOf('chrome') === -1 && ua.indexOf('safari') === -1) {
+            } else if (ua.indexOf("like gecko") !== -1 && ua.indexOf('webkit') === -1 && ua.indexOf('opera') === -1 && ua.indexOf('chrome') === -1 && ua.indexOf('safari') === -1) {
                 browser = "msie";
             }
         }
diff --git a/src/scripts/browserdeviceprofile.js b/src/scripts/browserdeviceprofile.js
index ad5237fde8..bc7c26769e 100644
--- a/src/scripts/browserdeviceprofile.js
+++ b/src/scripts/browserdeviceprofile.js
@@ -88,18 +88,14 @@ define(['browser'], function (browser) {
             if (browser.edgeUwp) {
                 return true;
             }
-        }
-
-        else if (format === 'wma') {
+        } else if (format === 'wma') {
             if (browser.tizen || browser.orsay) {
                 return true;
             }
             if (browser.edgeUwp) {
                 return true;
             }
-        }
-
-        else if (format === 'opus') {
+        } else if (format === 'opus') {
             typeString = 'audio/ogg; codecs="opus"';
 
             if (document.createElement('audio').canPlayType(typeString).replace(/no/, '')) {
@@ -107,9 +103,7 @@ define(['browser'], function (browser) {
             }
 
             return false;
-        }
-
-        else if (format === 'mp2') {
+        } else if (format === 'mp2') {
 
             // For now
             return false;
@@ -575,9 +569,7 @@ define(['browser'], function (browser) {
                     Type: 'Audio',
                     AudioCodec: audioFormat
                 });
-            }
-
-            else if (audioFormat === 'mp3') {
+            } else if (audioFormat === 'mp3') {
 
                 profile.DirectPlayProfiles.push({
                     Container: audioFormat,
diff --git a/src/scripts/editorsidebar.js b/src/scripts/editorsidebar.js
index bb35d8f60f..bcb3883755 100644
--- a/src/scripts/editorsidebar.js
+++ b/src/scripts/editorsidebar.js
@@ -2,19 +2,19 @@ define(["datetime", "jQuery", "material-icons"], function (datetime, $) {
     "use strict";
 
     function getNode(item, folderState, selected) {
-        var htmlName = getNodeInnerHtml(item),
-            node = {
-                id: item.Id,
-                text: htmlName,
-                state: {
-                    opened: item.IsFolder && folderState == "open",
-                    selected: selected
-                },
-                li_attr: {
-                    serveritemtype: item.Type,
-                    collectiontype: item.CollectionType
-                }
-            };
+        var htmlName = getNodeInnerHtml(item);
+        var node = {
+            id: item.Id,
+            text: htmlName,
+            state: {
+                opened: item.IsFolder && folderState == "open",
+                selected: selected
+            },
+            li_attr: {
+                serveritemtype: item.Type,
+                collectiontype: item.CollectionType
+            }
+        };
         if (item.IsFolder) {
             node.children = [{
                 text: "Loading...",
@@ -44,20 +44,15 @@ define(["datetime", "jQuery", "material-icons"], function (datetime, $) {
         var htmlName = "<div class='editorNode'>";
         if (item.IsFolder) {
             htmlName += '<i class="md-icon metadataSidebarIcon">folder</i>';
-        }
-        else if (item.MediaType === "Video") {
+        } else if (item.MediaType === "Video") {
             htmlName += '<i class="md-icon metadataSidebarIcon">movie</i>';
-        }
-        else if (item.MediaType === "Audio") {
+        } else if (item.MediaType === "Audio") {
             htmlName += '<i class="md-icon metadataSidebarIcon">audiotrack</i>';
-        }
-        else if (item.Type === "TvChannel") {
+        } else if (item.Type === "TvChannel") {
             htmlName += '<i class="md-icon metadataSidebarIcon">live_tv</i>';
-        }
-        else if (item.MediaType === "Photo") {
+        } else if (item.MediaType === "Photo") {
             htmlName += '<i class="md-icon metadataSidebarIcon">photo</i>';
-        }
-        else if (item.MediaType === "Book") {
+        } else if (item.MediaType === "Book") {
             htmlName += '<i class="md-icon metadataSidebarIcon">book</i>';
         }
         if (item.LockData) {
diff --git a/src/scripts/librarybrowser.js b/src/scripts/librarybrowser.js
index 4f3eaf4144..b9f3b92471 100644
--- a/src/scripts/librarybrowser.js
+++ b/src/scripts/librarybrowser.js
@@ -91,20 +91,20 @@ define(["userSettings"], function (userSettings) {
                 html += '<div style="display:inline-block;">';
 
                 if (showControls) {
-                    html += '<button is="paper-icon-button-light" class="btnPreviousPage autoSize" ' + (startIndex ? "" : "disabled") + '><i class="md-icon">&#xE5C4;</i></button>';
-                    html += '<button is="paper-icon-button-light" class="btnNextPage autoSize" ' + (startIndex + limit >= totalRecordCount ? "disabled" : "") + '><i class="md-icon">&#xE5C8;</i></button>';
+                    html += '<button is="paper-icon-button-light" class="btnPreviousPage autoSize" ' + (startIndex ? "" : "disabled") + '><i class="md-icon">arrow_back</i></button>';
+                    html += '<button is="paper-icon-button-light" class="btnNextPage autoSize" ' + (startIndex + limit >= totalRecordCount ? "disabled" : "") + '><i class="md-icon">arrow_forward</i></button>';
                 }
 
                 if (options.addLayoutButton) {
-                    html += '<button is="paper-icon-button-light" title="' + Globalize.translate("ButtonSelectView") + '" class="btnChangeLayout autoSize" data-layouts="' + (options.layouts || "") + '" onclick="LibraryBrowser.showLayoutMenu(this, \'' + (options.currentLayout || "") + '\');"><i class="md-icon">&#xE42A;</i></button>';
+                    html += '<button is="paper-icon-button-light" title="' + Globalize.translate("ButtonSelectView") + '" class="btnChangeLayout autoSize" data-layouts="' + (options.layouts || "") + '" onclick="LibraryBrowser.showLayoutMenu(this, \'' + (options.currentLayout || "") + '\');"><i class="md-icon">view_comfy</i></button>';
                 }
 
                 if (options.sortButton) {
-                    html += '<button is="paper-icon-button-light" class="btnSort autoSize" title="' + Globalize.translate("ButtonSort") + '"><i class="md-icon">&#xE053;</i></button>';
+                    html += '<button is="paper-icon-button-light" class="btnSort autoSize" title="' + Globalize.translate("ButtonSort") + '"><i class="md-icon">sort_by_alpha</i></button>';
                 }
 
                 if (options.filterButton) {
-                    html += '<button is="paper-icon-button-light" class="btnFilter autoSize" title="' + Globalize.translate("ButtonFilter") + '"><i class="md-icon">&#xE152;</i></button>';
+                    html += '<button is="paper-icon-button-light" class="btnFilter autoSize" title="' + Globalize.translate("ButtonFilter") + '"><i class="md-icon">filter_list</i></button>';
                 }
 
                 html += "</div>";
@@ -156,7 +156,8 @@ define(["userSettings"], function (userSettings) {
                 html += '<h2 style="margin:0 0 .5em;">';
                 html += Globalize.translate("HeaderSortBy");
                 html += "</h2>";
-                var i, length;
+                var i;
+                var length;
                 var isChecked;
                 html += '<div>';
                 for (i = 0, length = options.items.length; i < length; i++) {
diff --git a/src/scripts/librarymenu.js b/src/scripts/librarymenu.js
index ad15b8538e..7e3b109500 100644
--- a/src/scripts/librarymenu.js
+++ b/src/scripts/librarymenu.js
@@ -25,11 +25,6 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
         if (user && user.name) {
             if (user.imageUrl) {
                 var url = user.imageUrl;
-
-                if (user.supportsImageParams) {
-                    url += "&height=" + Math.round(26 * Math.max(window.devicePixelRatio || 1, 2));
-                }
-
                 updateHeaderUserButton(url);
                 hasImage = true;
             }
@@ -71,7 +66,7 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
             headerUserButton.innerHTML = '<div class="headerButton headerButtonRight paper-icon-button-light headerUserButtonRound" style="background-image:url(\'' + src + "');\"></div>";
         } else {
             headerUserButton.classList.remove("headerUserButtonRound");
-            headerUserButton.innerHTML = '<i class="md-icon">&#xE7FD;</i>';
+            headerUserButton.innerHTML = '<i class="md-icon">person</i>';
         }
     }
 
@@ -189,7 +184,6 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
             html += "</div>";
         }
 
-
         // add buttons to navigation drawer
         navDrawerScrollContainer.innerHTML = html;
         // bind logout button click to method
@@ -551,11 +545,11 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
         var icon = headerCastButton.querySelector("i");
 
         if (info && !info.isLocalPlayer) {
-            icon.innerHTML = "&#xE308;";
+            icon.innerHTML = "cast_connected";
             headerCastButton.classList.add("castButton-active");
             context.querySelector(".headerSelectedPlayer").innerHTML = info.deviceName || info.name;
         } else {
-            icon.innerHTML = "&#xE307;";
+            icon.innerHTML = "cast";
             headerCastButton.classList.remove("castButton-active");
             context.querySelector(".headerSelectedPlayer").innerHTML = "";
         }
@@ -843,16 +837,16 @@ define(["dom", "layoutManager", "inputManager", "connectionManager", "events", "
         var html = "";
         html += '<div class="flex align-items-center flex-grow headerTop">';
         html += '<div class="headerLeft">';
-        html += '<button type="button" is="paper-icon-button-light" class="headerButton headerButtonLeft headerBackButton hide"><i class="md-icon">' + (browser.safari ? "chevron_left" : "&#xE5C4;") + "</i></button>";
-        html += '<button type="button" is="paper-icon-button-light" class="headerButton headerHomeButton hide barsMenuButton headerButtonLeft"><i class="md-icon">&#xE88A;</i></button>';
-        html += '<button type="button" is="paper-icon-button-light" class="headerButton mainDrawerButton barsMenuButton headerButtonLeft hide"><i class="md-icon">&#xE5D2;</i></button>';
+        html += '<button type="button" is="paper-icon-button-light" class="headerButton headerButtonLeft headerBackButton hide"><i class="md-icon">' + (browser.safari ? "chevron_left" : "arrow_back") + "</i></button>";
+        html += '<button type="button" is="paper-icon-button-light" class="headerButton headerHomeButton hide barsMenuButton headerButtonLeft"><i class="md-icon">home</i></button>';
+        html += '<button type="button" is="paper-icon-button-light" class="headerButton mainDrawerButton barsMenuButton headerButtonLeft hide"><i class="md-icon">menu</i></button>';
         html += '<h3 class="pageTitle"></h3>';
         html += "</div>";
         html += '<div class="headerRight">';
         html += '<span class="headerSelectedPlayer"></span>';
-        html += '<button is="paper-icon-button-light" class="headerCastButton castButton headerButton headerButtonRight hide"><i class="md-icon">&#xE307;</i></button>';
-        html += '<button type="button" is="paper-icon-button-light" class="headerButton headerButtonRight headerSearchButton hide"><i class="md-icon">&#xE8B6;</i></button>';
-        html += '<button is="paper-icon-button-light" class="headerButton headerButtonRight headerUserButton hide"><i class="md-icon">&#xE7FD;</i></button>';
+        html += '<button is="paper-icon-button-light" class="headerCastButton castButton headerButton headerButtonRight hide"><i class="md-icon">cast</i></button>';
+        html += '<button type="button" is="paper-icon-button-light" class="headerButton headerButtonRight headerSearchButton hide"><i class="md-icon">search</i></button>';
+        html += '<button is="paper-icon-button-light" class="headerButton headerButtonRight headerUserButton hide"><i class="md-icon">person</i></button>';
         html += "</div>";
         html += "</div>";
         html += '<div class="headerTabs sectionTabs hide">';
diff --git a/src/scripts/routes.js b/src/scripts/routes.js
index 680a99a80b..a72e7e0566 100644
--- a/src/scripts/routes.js
+++ b/src/scripts/routes.js
@@ -447,6 +447,6 @@ define([
     defineRoute({
         path: "/",
         isDefaultRoute: true,
-        autoFocus: false,
+        autoFocus: false
     });
 });
diff --git a/src/scripts/site.js b/src/scripts/site.js
index d0dd0eaae3..828b882e7e 100644
--- a/src/scripts/site.js
+++ b/src/scripts/site.js
@@ -478,6 +478,9 @@ var AppInfo = {};
                     keyboardnavigation.enable();
                 });
                 require(["focusPreventScroll"]);
+                require(["autoFocuser"], function(autoFocuser) {
+                    autoFocuser.enable();
+                });
             });
         });
     }
@@ -866,6 +869,7 @@ var AppInfo = {};
         define("skinManager", [componentsPath + "/skinManager"], returnFirstDependency);
         define("keyboardnavigation", [componentsPath + "/keyboardnavigation"], returnFirstDependency);
         define("scrollManager", [componentsPath + "/scrollManager"], returnFirstDependency);
+        define("autoFocuser", [componentsPath + "/autoFocuser"], returnFirstDependency);
         define("connectionManager", [], function () {
             return ConnectionManager;
         });
diff --git a/src/strings/bg-bg.json b/src/strings/bg-bg.json
index ce12e70563..c7ce361903 100644
--- a/src/strings/bg-bg.json
+++ b/src/strings/bg-bg.json
@@ -59,7 +59,7 @@
     "ButtonPlay": "Пускане",
     "ButtonPreviousTrack": "Предишна пътека",
     "ButtonProfile": "Профил",
-    "ButtonQuickStartGuide": "Ръководство за бързо започване",
+    "ButtonQuickStartGuide": "Първи стъпки",
     "ButtonRefresh": "Опресняване",
     "ButtonRefreshGuideData": "Обновяване на данните в справочника",
     "ButtonRemove": "Премахване",
@@ -78,7 +78,7 @@
     "ButtonSignIn": "Вписване",
     "ButtonSignOut": "Отписване",
     "ButtonSort": "Подреждане",
-    "ButtonStop": "Стоп",
+    "ButtonStop": "Спиране",
     "ButtonSubmit": "Подаване",
     "ButtonSubtitles": "Субтитри",
     "ButtonUninstall": "Деинсталиране",
@@ -108,13 +108,13 @@
     "Display": "Показване",
     "Download": "Изтегляне",
     "DownloadsValue": "{0} изтегляния",
-    "EasyPasswordHelp": "Вашият лесен пин код е използван за офлайн достъп със съвместими Jellyfin приложения, както и за влизане през същата мрежа.",
+    "EasyPasswordHelp": "Вашият лесен пин-код се използва за достъп извън линия със съвместими приложения, както и за влизане през същата мрежа.",
     "Edit": "Редактиране",
     "EditImages": "Редактиране на изображенията",
     "EditMetadata": "Редактиране на метаданните",
     "EditSubtitles": "Редактиране на субтитрите",
     "EnableBackdrops": "Фонове",
-    "EnableCinemaMode": "Включване на режим \"Киносалон\"",
+    "EnableCinemaMode": "Режим \"Киносалон\"",
     "EnableThemeSongs": "Тематични песни",
     "Ended": "Приключило",
     "EndsAtValue": "Свършва на {0}",
@@ -209,7 +209,7 @@
     "HeaderLiveTv": "Телевизия на живо",
     "HeaderMedia": "Медия",
     "HeaderMediaFolders": "Медийни папки",
-    "HeaderMediaInfo": "Данни",
+    "HeaderMediaInfo": "Сведения",
     "HeaderMetadataSettings": "Настройки на метаданните",
     "HeaderMoreLikeThis": "Подобни",
     "HeaderMovies": "Филми",
@@ -248,7 +248,7 @@
     "HeaderSecondsValue": "{0} секунди",
     "HeaderSelectPath": "Изберете път",
     "HeaderSendMessage": "Изпращане на съобщение",
-    "HeaderSeries": "Series:",
+    "HeaderSeries": "Сериал",
     "HeaderServerSettings": "Настройки на сървъра",
     "HeaderSettings": "Настройки",
     "HeaderSetupLibrary": "Настройте своите медийни библиотеки",
@@ -256,7 +256,7 @@
     "HeaderSortOrder": "Ред на подреждане",
     "HeaderSpecialFeatures": "Специални функции",
     "HeaderStartNow": "Пускане веднага",
-    "HeaderStatus": "Състояние:",
+    "HeaderStatus": "Състояние",
     "HeaderSubtitleAppearance": "Облик на субтитрите",
     "HeaderSystemDlnaProfiles": "Системни профили",
     "HeaderTags": "Етикети",
@@ -289,7 +289,7 @@
     "LabelAlbumArtPN": "ПН на албумното изкуство:",
     "LabelAlbumArtists": "Изпълнители на албума:",
     "LabelAllowServerAutoRestart": "Разрешаване на сървъра автоматично да се пуска повторно за прилагане на обновления",
-    "LabelAllowServerAutoRestartHelp": "Сървърът ще се рестартира само през свободното си време, когато няма активни потребители.",
+    "LabelAllowServerAutoRestartHelp": "Сървърът ще се пуска наново само през ненатоварено време, когато няма активни потребители.",
     "LabelAppName": "Име",
     "LabelArtists": "Изпълнители:",
     "LabelArtistsHelp": "Отделете няколко с ;",
@@ -299,7 +299,7 @@
     "LabelCertificatePassword": "Парола на сертификата:",
     "LabelCertificatePasswordHelp": "Ако сертификатът ви изисква парола, моля, въведете я тук.",
     "LabelCollection": "Колекция:",
-    "LabelCommunityRating": "Обществена оценка",
+    "LabelCommunityRating": "Обществена оценка:",
     "LabelContentType": "Тип на съдържанието:",
     "LabelCountry": "Държава:",
     "LabelCriticRating": "Оценка на критиците:",
@@ -333,7 +333,7 @@
     "LabelEnableDlnaClientDiscoveryIntervalHelp": "Определя времетраенето в секунди между SSDP търсения направени от Jellyfin.",
     "LabelEnableDlnaDebugLogging": "Включване на журналите за грешки на ДЛНА",
     "LabelEnableDlnaPlayTo": "Включване на функцията \"възпроизвеждане с ДЛНА\"",
-    "LabelEnableDlnaPlayToHelp": "Емби може да засича устройства в мрежата ви и да предлага възможност за дистанционен контрол.",
+    "LabelEnableDlnaPlayToHelp": "Засичане на устройства в мрежата ви и предлагане на възможност за дистанционно управление.",
     "LabelEnableDlnaServer": "Включване на ДЛНА-сървър",
     "LabelEnableDlnaServerHelp": "Разрешава на UPnP устройства в мрежата да разглеждат и пускат Jellyfin съдържание.",
     "LabelEnableRealtimeMonitor": "Активиране на наблюдение в реално време",
@@ -414,7 +414,7 @@
     "LabelPublicHttpPortHelp": "Публичният порт, който да бъде съпоставен с локалния HTTP порт.",
     "LabelPublicHttpsPort": "Публичен HTTPS порт:",
     "LabelPublicHttpsPortHelp": "Публичният порт, който да бъде съпоставен с локалния HTTPS порт.",
-    "LabelReadHowYouCanContribute": "Научете как можете да допринесете",
+    "LabelReadHowYouCanContribute": "Научете как можете да допринесете.",
     "LabelRecordingPath": "Път за запис по подразбиране:",
     "LabelReleaseDate": "Дата на издаване:",
     "LabelRemoteClientBitrateLimit": "Ограничение на интернетното излъчване (мбит/сек):",
@@ -428,7 +428,7 @@
     "LabelSkipIfAudioTrackPresent": "Да се пропусне, ако звуковата пътечка по подразбиране съвпада с езика",
     "LabelSkipIfGraphicalSubsPresent": "Да се пропусне, ако файлът съдържа вградени субтитри",
     "LabelSortBy": "Подреждане по:",
-    "LabelSortOrder": "Ред на подреждане",
+    "LabelSortOrder": "Ред на подреждане:",
     "LabelSource": "Източник:",
     "LabelSpecialSeasonsDisplayName": "Име на сезона със специални епизоди:",
     "LabelStartWhenPossible": "Започвай, когато е възможно:",
@@ -460,7 +460,7 @@
     "LabelYoureDone": "Готови сте!",
     "Large": "Голям",
     "LatestFromLibrary": "Последни {0}",
-    "LibraryAccessHelp": "Изберете медийните папки, които да споделите с потребителя. Администраторите ще могат да редактират всички папки, използвайки управлението на метаданни.",
+    "LibraryAccessHelp": "Изберете библиотеките, които да споделите с потребителя. Администраторите ще могат да редактират всички папки, използвайки управлението на метаданни.",
     "Like": "Харесване",
     "LinksValue": "Препратки: {0}",
     "List": "Списък",
@@ -487,7 +487,7 @@
     "MessageAlreadyInstalled": "Версията вече е инсталирана.",
     "MessageAreYouSureYouWishToRemoveMediaFolder": "Сигурни ли сте, че искате да премахнете медийната папка?",
     "MessageConfirmRestart": "Наистина ли искате да пуснете сървъра наново?",
-    "MessageConfirmShutdown": "Наистина ли искате да спрете Jellyfin сървърът?",
+    "MessageConfirmShutdown": "Наистина ли искате да загасите сървъра?",
     "MessageNoAvailablePlugins": "Няма налични приставки.",
     "MessageNoPluginsInstalled": "Нямате инсталирани приставки.",
     "MessageNothingHere": "Тук няма нищо.",
@@ -501,7 +501,7 @@
     "Mobile": "Мобилно устройство",
     "Monday": "Понеделник",
     "MoreFromValue": "Още от {0}",
-    "MoreUsersCanBeAddedLater": "Повече потребители могат да бъдат добавени по-късно от главния панел.",
+    "MoreUsersCanBeAddedLater": "Можете да добавите още потребители от таблото.",
     "Movies": "Филми",
     "Mute": "Заглушаване",
     "MySubtitles": "Моите субтитри",
@@ -578,7 +578,7 @@
     "OptionHasTrailer": "Трейлър",
     "OptionHideUser": "Скриване на потребителя от страниците за вход",
     "OptionHideUserFromLoginHelp": "Полезно за частни или скрити администраторски профили. Потребителят ще трябва да влезе ръчно чрез въвеждане на потребителско име и парола.",
-    "OptionHomeVideos": "Домашни клипове и снимки",
+    "OptionHomeVideos": "Снимки",
     "OptionImdbRating": "Оценка в IMDb",
     "OptionIsHD": "ВК",
     "OptionIsSD": "СК",
@@ -608,7 +608,7 @@
     "OptionSpecialEpisode": "Специални",
     "OptionSunday": "Неделя",
     "OptionThursday": "Четвъртък",
-    "OptionTrackName": "Име на песента:",
+    "OptionTrackName": "Име на песента",
     "OptionTuesday": "Вторник",
     "OptionUnairedEpisode": "Неизлъчени епизоди",
     "OptionUnplayed": "Непускано",
@@ -672,7 +672,7 @@
     "ShowAdvancedSettings": "Разширени настройки",
     "ShowTitle": "Показване на заглавието",
     "ShowYear": "Показване на годината",
-    "Shows": "Предавания",
+    "Shows": "Сериали",
     "Shuffle": "Пускане в разбъркан ред",
     "Small": "Малък",
     "Smart": "Умни",
@@ -757,7 +757,7 @@
     "Unmute": "Без заглушаване",
     "Unplayed": "Непускано",
     "Upload": "Качване",
-    "UserProfilesIntro": "Емби включва вградена поддръжка на потребителски профили, които позволяват на всеки потребител да има свои настройки на картината, място на пускане и родителски настройки.",
+    "UserProfilesIntro": "Джелифин включва поддръжка на потребителски профили със самостоятелни настройки на картината, пускането и родителските настройки.",
     "ValueAlbumCount": "{0} албума",
     "ValueAudioCodec": "Звуков кодек: {0}",
     "ValueCodec": "Кодек: {0}",
@@ -784,9 +784,9 @@
     "Watched": "Изгледано",
     "Wednesday": "Сряда",
     "WelcomeToProject": "Добре дошли в Емби!",
-    "WizardCompleted": "Това е всичко от което се нуждаем за момента. Емби започна да събира данни за медийната ви библиотека. Разгледайте някои от нашите приложения, после натиснете <b>Готово</b>, за да видите <b>таблото на сървъра</b>.",
+    "WizardCompleted": "Това е всичко, от което се нуждаем за момента. Джелифин започва да събира данни за библиотеката ви. Разгледайте някои от нашите приложения, после натиснете <b>Готово</b>, за да видите <b>таблото на сървъра</b>.",
     "Writer": "Писател",
-    "AllowMediaConversion": "Разрешаване на медиини преобразувания",
+    "AllowMediaConversion": "Разрешаване на медийни преобразувания",
     "AllLanguages": "Всички езици",
     "AllEpisodes": "Всички епизоди",
     "AllComplexFormats": "Всички комплексни формати (ASS, SSA, VOBSUB, PGS, SUB/IDX, и т.н.)",
@@ -794,5 +794,44 @@
     "Alerts": "Известия",
     "AdditionalNotificationServices": "Разгледайте каталога с добавки за допълнителни услуги за известяване.",
     "AddToPlayQueue": "Добавяне към опашка",
-    "AccessRestrictedTryAgainLater": "Достъпът е временно ограничен. Моля опитайте отново по-късно."
+    "AccessRestrictedTryAgainLater": "Достъпът е временно ограничен. Моля, опитайте отново по-късно.",
+    "HeaderFavoriteSongs": "Любими песни",
+    "HeaderFavoriteShows": "Любими сериали",
+    "HeaderFavoriteEpisodes": "Любими епизоди",
+    "HeaderFavoriteArtists": "Любими изпълнители",
+    "HeaderFavoriteAlbums": "Любими албуми",
+    "Folders": "Папки",
+    "No": "Не",
+    "Yes": "Да",
+    "MediaInfoStreamTypeSubtitle": "Субтитри",
+    "MediaInfoStreamTypeEmbeddedImage": "Вградено изображение",
+    "MediaInfoStreamTypeData": "Данни",
+    "MediaInfoStreamTypeAudio": "Звук",
+    "MediaInfoContainer": "Контейнер",
+    "MediaInfoInterlaced": "Презредово",
+    "MediaInfoForced": "Принудително",
+    "MediaInfoLayout": "Подредба",
+    "MusicVideo": "Музикален клип",
+    "MediaInfoStreamTypeVideo": "Видео",
+    "LabelVideo": "Видео:",
+    "HeaderVideoTypes": "Видове видеа",
+    "HeaderVideoType": "Вид на видеото",
+    "EnableExternalVideoPlayers": "Външни възпроизводители",
+    "HeaderLoginFailure": "Неуспешно вписване",
+    "Metadata": "Метаданни",
+    "ReplaceAllMetadata": "Заменяне на всички метаданни",
+    "ReplaceExistingImages": "Заменяне на текущите изображения",
+    "Channels": "Канали",
+    "Categories": "Категории",
+    "ButtonViewWebsite": "Преглед на сайта",
+    "ButtonUp": "Нагоре",
+    "ButtonTrailer": "Предварителен откъс",
+    "ButtonStart": "Пускане",
+    "ButtonSelectView": "Изберете изглед",
+    "ButtonSelectServer": "Изберете сървър",
+    "ButtonRepeat": "Повтаряне",
+    "ButtonNetwork": "Мрежа",
+    "ButtonFullscreen": "На цял екран",
+    "ButtonDown": "Надолу",
+    "ButtonConnect": "Свързване"
 }
diff --git a/src/strings/de.json b/src/strings/de.json
index 6899e251d2..54ed6af1a0 100644
--- a/src/strings/de.json
+++ b/src/strings/de.json
@@ -1,12 +1,12 @@
 {
-    "Absolute": "Absolut",
+    "Absolute": "Gesamt",
     "AccessRestrictedTryAgainLater": "Der Zugriff ist derzeit eingeschränkt. Bitte versuche es später erneut.",
     "Actor": "Darsteller(in)",
     "Add": "Hinzufügen",
     "AddGuideProviderHelp": "Fernsehprogrammquelle hinzufügen",
     "AddItemToCollectionHelp": "Fügen Sie Elemente zu Sammlungen hinzu, indem Sie sie suchen und deren Rechtsklick- oder Antippmenü benutzen.",
     "AddToCollection": "Zur Sammlung hinzufügen",
-    "AddToPlayQueue": "Zur Abspielwarteschlange hinzufügen",
+    "AddToPlayQueue": "Zur Warteschlange hinzufügen",
     "AddToPlaylist": "Zur Wiedergabeliste hinzufügen",
     "AddUser": "Benutzer anlegen",
     "AddUserByManually": "Lege einen lokalen User durch manuelle Eingabe der User-Informationen an.",
@@ -60,7 +60,7 @@
     "BoxRear": "Box (Rückseite)",
     "Browse": "Blättern",
     "BrowsePluginCatalogMessage": "Durchsuche unsere Bibliothek, um alle verfügbaren Plugins anzuzeigen.",
-    "BurnSubtitlesHelp": "Legt fest, ob der Server die Untertitel basierend auf deren Format einbrennen soll während der Videokonvertierung. Die Vermeidung des Einbrennen von Untertiteln verbessert die Serverperformance. Wähle Auto, um Bildfomate (z.B. VOBSUB, PGS, SUB/IDX, etc.) sowie bestimmte ASS/SSA-Untertitel einbrennen zu lassen.",
+    "BurnSubtitlesHelp": "Legt fest, ob der Server die Untertitel basierend auf deren Format während der Videokonvertierung einbrennen soll. Die Vermeidung des Einbrennen von Untertiteln verbessert die Serverperformance. Wähle Auto, um Bildfomate (z.B. VOBSUB, PGS, SUB/IDX, etc.) sowie bestimmte ASS/SSA-Untertitel einbrennen zu lassen.",
     "ButtonAdd": "Hinzufügen",
     "ButtonAddMediaLibrary": "Füge Medienbibliothek hinzu",
     "ButtonAddScheduledTaskTrigger": "Auslöser hinzufügen",
@@ -171,7 +171,7 @@
     "DetectingDevices": "Suche Geräte",
     "DeviceAccessHelp": "Dies wird nur auf Geräte angewandt die eindeutig identifiziert werden können und verhindert nicht den Web-Zugriff. Gefilterter Zugriff auf Geräte verhindert die Nutzung neuer Geräte solange, bis der Zugriff für diese freigegeben wird.",
     "DirectPlaying": "Direktes Abspielen",
-    "DirectStreamHelp1": "Das Medium ist mit dem Abspielgerät kompatibel bzgl. Auflösung und Codecs (H.264, AC3, etc.), besitzt jedoch ein inkompatibles Containerformat (.mkv, .avi, .wmv, etc.). Das Video wird in Echtzeit neuverpackt bevor es zum Abspielgerät gestreamt wird.",
+    "DirectStreamHelp1": "Das Medium ist mit dem Abspielgerät kompatibel bzgl. Auflösung und Codecs (H.264, AC3, etc.), besitzt jedoch ein inkompatibles Containerformat (mkv, avi, wmv, etc.). Das Video wird in Echtzeit neuverpackt bevor es zum Abspielgerät gestreamt wird.",
     "DirectStreamHelp2": "Direktes Streaming von Dateien benötigt sehr wenig Rechenleistung ohne Verlust der Videoqualität.",
     "DirectStreaming": "Direktes Streaming",
     "Director": "Regisseur",
@@ -185,36 +185,36 @@
     "DisplayInMyMedia": "Zeige auf Homescreen",
     "DisplayInOtherHomeScreenSections": "Zeige auf dem Homescreen Bereiche wie 'Neueste Medien' oder 'Weiterschauen'",
     "DisplayMissingEpisodesWithinSeasons": "Zeige fehlende Episoden innerhalb von Staffeln",
-    "DisplayMissingEpisodesWithinSeasonsHelp": "Dies sollte auch für Serienbibliotheken in den Jellyfin Server Einstellungen aktiviert sein.",
+    "DisplayMissingEpisodesWithinSeasonsHelp": "Dies muss auch für Serienbibliotheken in den Servereinstellungen aktiviert sein.",
     "DisplayModeHelp": "Bitte wähle den Typ des Bildschirms auf dem Du Jellyfin verwendest.",
     "DoNotRecord": "Nicht aufnehmen",
     "Down": "Runter",
     "DownloadsValue": "{0} Downloads",
     "DrmChannelsNotImported": "Verschlüsselte Kanäle werden nicht importiert.",
     "DropShadow": "Schlagschatten",
-    "EasyPasswordHelp": "Die vereinfachte PIN Eingabe wird für offline Zugriffe von unterstützenden Jellyfin Apps verwendet. Sie kann ebenso als erleichterten Zugang aus dem eigenen Netzwerk verwendet werden.",
+    "EasyPasswordHelp": "Die vereinfachte PIN-Eingabe wird für Offline-Zugriffe über unterstützte Clients verwendet. Sie kann ebenso für ein einfaches Einloggen über das eigene Netzwerk verwendet werden.",
     "Edit": "Bearbeiten",
     "EditImages": "Bearbeite Bilder",
     "EditMetadata": "Bearbeite Metadaten",
     "EditSubtitles": "Untertitel bearbeiten",
-    "EnableBackdrops": "Aktiviere Hintergründe",
-    "EnableBackdropsHelp": "Wenn aktiviert, werden während des Browsens durch die Bibliothek auf einigen Seiten passende Hintergründe angezeigt.",
+    "EnableBackdrops": "Hintergründe",
+    "EnableBackdropsHelp": "Zeige während des Browsens durch die Bibliothek auf einigen Seiten passende Hintergründe an",
     "EnableCinemaMode": "Kino-Modus",
-    "EnableColorCodedBackgrounds": "Aktiviere farbige Hintergründe",
+    "EnableColorCodedBackgrounds": "Farbige Hintergründe",
     "EnableDisplayMirroring": "Display-Spiegelung",
     "EnableExternalVideoPlayers": "Externe Videoplayer",
     "EnableExternalVideoPlayersHelp": "Ein Menü für externe Videoplayer wird beim Start der Videowiedergabe angezeigt.",
     "EnableHardwareEncoding": "Aktiviere Hardware-Encoding",
-    "EnableNextVideoInfoOverlay": "Aktiviere \"Next-Video-Info\" während der Wiedergabe",
+    "EnableNextVideoInfoOverlay": "Zeige \"Next-Video-Info\" während der Wiedergabe",
     "EnableNextVideoInfoOverlayHelp": "Zeige Informationen über das nächste abzuspielende Video in der aktuellen Abspielliste am Ende des laufenden Videos an.",
-    "EnablePhotos": "Aktiviere Fotos",
-    "EnablePhotosHelp": "Fotos werden erkannt und neben anderen Mediendateien angezeigt.",
+    "EnablePhotos": "Zeige Fotos",
+    "EnablePhotosHelp": "Bilder werden erkannt und neben anderen Mediendateien angezeigt.",
     "EnableStreamLooping": "Auto-Schleife Live Streams",
     "EnableStreamLoopingHelp": "Aktivieren, wenn Live Streams nur ein paar Sekunden Daten enthalten und ständig angefragt werden müssen. Kann zu Problemen führen wenn aktiviert, obwohl nicht nötig.",
-    "EnableThemeSongs": "Aktiviere Titelmelodien",
-    "EnableThemeSongsHelp": "Wenn aktiviert, wird Titelmusik während des Browsens durch die Bibliothek im Hintergrund abgespielt.",
-    "EnableThemeVideos": "Altiviere Titelvideos",
-    "EnableThemeVideosHelp": "Wenn aktiviert, wird ein Titelvideo während dem Durchsuchen durch die Bibliothek im Hintergrund abgespielt.",
+    "EnableThemeSongs": "Titelmelodien",
+    "EnableThemeSongsHelp": "Titelmusik wird während des Blätterns durch die Bibliothek im Hintergrund abgespielt.",
+    "EnableThemeVideos": "Titelvideos",
+    "EnableThemeVideosHelp": "Titelvideos werden während des Blätterns durch die Bibliothek im Hintergrund abgespielt.",
     "Ended": "Beendent",
     "EndsAtValue": "Endet um {0}",
     "Episodes": "Episoden",
@@ -223,7 +223,7 @@
     "ErrorAddingTunerDevice": "Es trat ein Fehler beim hinzufügen eines Tuners auf. Bitte stellen Sie sicher das dieser erreichbar ist und versuchen Sie es erneut.",
     "ErrorAddingXmlTvFile": "Fehler beim Zugriff auf die XmlTV Datei. Stelle bitte sicher, dass die Datei existiert und versuche es nochmal.",
     "ErrorDeletingItem": "Fehler beim Löschen des Mediums vom Jellyfin Server. Bitte stelle sicher dass der Jellyfin Server Schreibzugriff auf den Dateiordner hat und versuche es erneut.",
-    "ErrorGettingTvLineups": "Ein Fehler trat beim herunterladen des TV Programs auf. Bitte stellen Sie sicher, dass Ihre Informationen korrekt sind und versuchen Sie es erneut.",
+    "ErrorGettingTvLineups": "Ein Fehler trat beim Herunterladen des Fernsehprogramms auf. Bitte stellen Sie sicher, dass Ihre Informationen korrekt sind und versuchen Sie es erneut.",
     "ErrorMessageStartHourGreaterThanEnd": "Die Endzeit muss größer als die Startzeit sein.",
     "ErrorPleaseSelectLineup": "Bitte wählen Sie ein TV Programm und versuchen Sie es erneut. Wenn keine Programme verfügbar sind prüfen Sie bitte Benutzername, Passwort und Ihre Postleitzahl.",
     "ErrorSavingTvProvider": "Ein Fehler beim speichern des TV Verzeichnisses trat auf. Bitte stellen Sie sicher das dieser erreichbar ist und versuchen Sie es erneut.",
@@ -359,7 +359,7 @@
     "HeaderLibraryFolders": "Bibliotheksverzeichnisse",
     "HeaderLibraryOrder": "Bibliotheksreihenfolge",
     "HeaderLibrarySettings": "Bibliothekseinstellungen",
-    "HeaderLiveTV": "Live-TV",
+    "HeaderLiveTV": "Live TV",
     "HeaderLiveTv": "Live-TV",
     "HeaderLiveTvTunerSetup": "TV Tuner Setup",
     "HeaderLoginFailure": "Login Fehler",
@@ -422,7 +422,7 @@
     "HeaderSelectServerCachePathHelp": "Suche oder gib den Pfad für die Speicherung von Server Cache Dateien an. Das Verzeichnis muss beschreibbar sein.",
     "HeaderSelectTranscodingPath": "Wähle Pfad für temporäre Transkodierdateien",
     "HeaderSelectTranscodingPathHelp": "Suche oder gib den Pfad für die Speicherung von temporären Transkodierdateien an. Das Verzeichnis muss beschreibbar sein.",
-    "HeaderSendMessage": "sende Nachricht",
+    "HeaderSendMessage": "Nachricht senden",
     "HeaderSeries": "Serien",
     "HeaderSeriesOptions": "Serienoptionen",
     "HeaderSeriesStatus": "Serienstatus",
@@ -495,7 +495,7 @@
     "LabelAll": "Alle",
     "LabelAllowHWTranscoding": "Erlaube Hardware Transkodierung",
     "LabelAllowServerAutoRestart": "Erlaube dem Server sich automatisch neuzustarten, um Updates durchzuführen",
-    "LabelAllowServerAutoRestartHelp": "Der Server startet nur in benutzerfreien Leerlaufzeiten neu.",
+    "LabelAllowServerAutoRestartHelp": "Der Server startet nur wenn keine Nutzer aktiv sind neu.",
     "LabelAllowedRemoteAddresses": "Remote-IP Adressen Filter:",
     "LabelAllowedRemoteAddressesMode": "Remote IP Adressen Filtermodus:",
     "LabelAppName": "App Name",
@@ -509,7 +509,7 @@
     "LabelBirthDate": "Geburtsdatum:",
     "LabelBirthYear": "Geburtsjahr:",
     "LabelBlastMessageInterval": "Alive Meldungsintervall (Sekunden)",
-    "LabelBlastMessageIntervalHelp": "Legt die Dauer in Sekunden zwischen den Server Alive Meldungen fest.",
+    "LabelBlastMessageIntervalHelp": "Legt die Dauer in Sekunden zwischen den Server-Alive-Meldungen fest.",
     "LabelBlockContentWithTags": "Blockiere Inhalte mit Tags:",
     "LabelBurnSubtitles": "Untertitel einbrennen:",
     "LabelCachePath": "Cache Pfad:",
@@ -1461,5 +1461,13 @@
     "MoreMediaInfo": "Medieninformation",
     "MessageNoServersAvailable": "Die automatische Serversuche konnte keinen Server finden.",
     "LabelPlayer": "Player:",
-    "MediaInfoCodecTag": "Codec Tag"
+    "MediaInfoCodecTag": "Codec Tag",
+    "SubtitleOffset": "Untertitelvorlauf",
+    "PlaybackData": "Wiedergabeinformationen",
+    "OptionThumbCard": "Vorschaukarte",
+    "OptionPosterCard": "Posterkarte",
+    "OptionPoster": "Poster",
+    "OptionList": "Liste",
+    "OptionBanner": "Banner",
+    "MusicVideo": "Musikvideo"
 }
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 4d83b070d1..d72b74971a 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -354,6 +354,7 @@
     "HeaderFavoriteShows": "Favorite Shows",
     "HeaderFavoriteEpisodes": "Favorite Episodes",
     "HeaderFavoriteAlbums": "Favorite Albums",
+    "HeaderFavoritePeople": "Favorite People",
     "HeaderFavoriteArtists": "Favorite Artists",
     "HeaderFavoriteSongs": "Favorite Songs",
     "HeaderFavoriteVideos": "Favorite Videos",
diff --git a/src/strings/fr.json b/src/strings/fr.json
index b89cda0015..05ef432660 100644
--- a/src/strings/fr.json
+++ b/src/strings/fr.json
@@ -51,7 +51,7 @@
     "BoxRear": "Dos de boîtier",
     "Browse": "Parcourir",
     "BrowsePluginCatalogMessage": "Explorer notre catalogue des plugins pour voir les plugins disponibles.",
-    "BurnSubtitlesHelp": "Détermine si le serveur doit graver les sous-titres lors de la conversion vidéo en fonction du format de sous-titre. Éviter la gravure des sous-titres améliorera les performances du serveur. Sélectionnez Auto pour graver les formats basés sur l'image (VOBSUB, PGS, SUB/IDX etc) ainsi que certains sous-titres ASS/SSA.",
+    "BurnSubtitlesHelp": "Détermine si le serveur doit incruster les sous-titres lors de la conversion vidéo en fonction du format de sous-titre. Éviter l'incrustation des sous-titres améliorera les performances du serveur. Sélectionnez Auto pour incruster les formats basés sur l'image (VOBSUB, PGS, SUB/IDX etc) ainsi que certains sous-titres ASS/SSA.",
     "ButtonAdd": "Ajouter",
     "ButtonAddMediaLibrary": "Ajouter une médiathèque",
     "ButtonAddScheduledTaskTrigger": "Ajouter un déclencheur",
@@ -172,7 +172,7 @@
     "DetectingDevices": "Détection des appareils",
     "DeviceAccessHelp": "Ceci ne s'applique qu'aux appareils qui peuvent être identifiés de manière unique et n'empêchera pas l'accès par navigateur. Le filtrage de l'accès aux appareil par utilisateur empêchera l'utilisation de nouveaux appareils jusqu'à ce qu'ils soient approuvés ici.",
     "DirectPlaying": "Lecture directe",
-    "DirectStreamHelp1": "Le média est compatible avec l'appareil en ce qui concerne la résolution et le type de média (H.264, AC3 etc), mais se trouve dans un conteneur de fichiers incompatible (mkv, avi, wmv, etc). La vidéo sera rempaquetée à la volée avant d'être diffusée à l'appareil.",
+    "DirectStreamHelp1": "Le média est compatible avec l'appareil en ce qui concerne la résolution et le type de média (H.264, AC3,etc), mais se trouve dans un conteneur de fichiers incompatible (mkv, avi, wmv, etc). La vidéo sera rempaquetée à la volée avant d'être diffusée à l'appareil.",
     "DirectStreamHelp2": "Le streaming en direct d'un fichier utilise très peu de puissance de traitement sans perte de qualité vidéo.",
     "DirectStreaming": "Streaming direct",
     "Director": "Réalisateur(trice)",
@@ -1449,6 +1449,7 @@
     "LabelAudioChannels": "Canaux audio :",
     "HeaderFavoriteBooks": "Livres Favoris",
     "FetchingData": "Récupération de données additionnelles",
-    "CopyStreamURLSuccess": "Lien copié avec succès.",
-    "CopyStreamURL": "Copier le lien du flux"
+    "CopyStreamURLSuccess": "URL copié avec succès.",
+    "CopyStreamURL": "Copier l'URL du flux",
+    "LabelBaseUrlHelp": "Vous pouvez ajouter un sous-répertoire personnalisé pour accéder au serveur à partir d'une URL unique."
 }
diff --git a/src/strings/hu.json b/src/strings/hu.json
index ea50446071..df6a4bca4c 100644
--- a/src/strings/hu.json
+++ b/src/strings/hu.json
@@ -1302,7 +1302,7 @@
     "TabNetworking": "Hálózat",
     "HeaderFavoriteArtists": "Kedvenc előadók",
     "SmallCaps": "Kiskapitális",
-    "AllowOnTheFlySubtitleExtractionHelp": "A beágyazott feliratokat ki lehet távolítani a videókból és elküldeni a Jellyfin alkalmazásoknak sima szöveg formátumba, hogy ne legyen átkódolás. Néhány eszközön ez hosszú ideig is eltarthat, valamint a videó lejátszás megakadhat az eltávolítási folyamat futása közben. Ezt kikapcsolva a beágyazott feliratok videó átkódolással beégetésre kerülnek azon kliens eszközökre melyek nem támogatják a külső feliratokat.",
+    "AllowOnTheFlySubtitleExtractionHelp": "A beágyazott feliratokat ki lehet nyerni a videókból és elküldeni az alkalmazásoknak sima szöveg formátumba, hogy ne legyen átkódolás. Néhány eszközön ez hosszú ideig is eltarthat, valamint a videó lejátszás megakadhat az eltávolítási folyamat futása közben. Ezt kikapcsolva a beágyazott feliratok videó átkódolással beégetésre kerülnek azon kliens eszközökre melyek nem támogatják a külső feliratokat.",
     "Art": "ClearArt",
     "AuthProviderHelp": "Válaszd ki az azonosítási szolgáltatást amely ezen felhasználó jelszavának ellenőrzését valósítja meg.",
     "BurnSubtitlesHelp": "Meghatározza, hogy a szervernek be kell-e égetnie a feliratot videó átkódolás esetén a felirat típusának függvényében. A beégetés elkerülésével a szerver teljesítménye javul. Válaszd az Auto lehetőséget a kép alapú feliratok (pl. VOBSUB, PGS, SUB/IDX, stb) és bizonyos ASS/SSA feliratok beégetéséhez.",
@@ -1317,7 +1317,7 @@
     "H264CrfHelp": "A Constant Rate Factor (CRF) az alapértelmezett minőségi beállítás az x264 enkóderhez. Az értékek 0 és 51 között állíthatók, ahol az alacsonyabb érték jobb minőséget eredményez (nagyobb fájl méret mellett). Az ajánlott érték 18 és 28 között van. Az x264 alapértelmezett beállítása 23, ez lehet kiindulási alap.",
     "HeaderAddScheduledTaskTrigger": "Vezérlő Hozzáadása",
     "HeaderApiKeysHelp": "A külső alkalmazásoknak egy API kulcsra van szükésge, hogy kommunikáljanak a Jellyfin szerverrel. A kulcsokat egy Jellyfin fiókkal történő belépéssel lehet megkapni, vagy kézileg felvenni egy alkalmazáshoz tartozó kulcsot.",
-    "HeaderBranding": "Személyes védjegy",
+    "HeaderBranding": "Személyes arculat",
     "HeaderContinueListening": "Folyamatban lévő zenék",
     "HeaderDeleteTaskTrigger": "Feladatvezérlő törlése",
     "HeaderFavoriteMovies": "Kedvenc Filmek",
diff --git a/src/strings/ro.json b/src/strings/ro.json
index 221dfcbaec..f40c51d0e2 100644
--- a/src/strings/ro.json
+++ b/src/strings/ro.json
@@ -221,5 +221,28 @@
     "UserProfilesIntro": "Jellyfin include sprijin pentru profile de utilizator, permițând fiecărui utilizator să își facă propriile setări de afișare, playstate și control parental.",
     "Wednesday": "Miercuri",
     "WelcomeToProject": "Bine ați venit la Jellyfin!",
-    "WizardCompleted": "Asta e tot ce avem nevoie pentru moment. Jellyfin a început colectarea de informații despre biblioteca media. Verifică unele din aplicațiile noastre, și apoi faceți clic pe <b>Finalizare</b> pentru a vizualiza <b>Tabloul de bord al Serverului </b>."
+    "WizardCompleted": "Asta e tot ce avem nevoie pentru moment. Jellyfin a început colectarea de informații despre biblioteca media. Verifică unele din aplicațiile noastre, și apoi faceți clic pe <b>Finalizare</b> pentru a vizualiza <b>Tabloul de bord al Serverului </b>.",
+    "AllowOnTheFlySubtitleExtraction": "Permite extragerea subtitrărilor în timp real",
+    "AllowMediaConversionHelp": "Permite sau interzice accesul la funcția de conversie media.",
+    "AllowMediaConversion": "Permite coversia media",
+    "AllowHWTranscodingHelp": "Permite tunerului să transcodeze automat. Poate ajuta la reducerea timpului necesar pentru transcodare pe server.",
+    "AllLibraries": "Toate librăriile",
+    "AllLanguages": "Toate limbile",
+    "AllEpisodes": "Toate episoadele",
+    "AllComplexFormats": "Toate formatele complexe (ASS, SSA, VOBSUB, PGS, SUB/IDX, etc.)",
+    "AllChannels": "Toate canalele",
+    "Alerts": "Alerte",
+    "Albums": "Albume",
+    "Aired": "Premiera emisă",
+    "AirDate": "Data premierei",
+    "AdditionalNotificationServices": "Caută în catalogul de extensii pentru alte servicii de notificate.",
+    "AddToCollection": "Adaugă la colecție",
+    "Absolute": "Absolut",
+    "AddedOnValue": "Adăugat la {0}",
+    "AddToPlaylist": "Adaugă la playlist",
+    "AddToPlayQueue": "Adaugă la coada de redare",
+    "AddItemToCollectionHelp": "Adaugă obiectele la colecții căutând-le și folosind meniul de click-dreapta sau apasare pentru a le adăuga la colecție.",
+    "Add": "Adaugă",
+    "Actor": "Actor",
+    "AccessRestrictedTryAgainLater": "Accesul este restricționat. Te rugăm să încerci mai târziu."
 }
diff --git a/src/strings/ru.json b/src/strings/ru.json
index 1846e95026..eed91150d2 100644
--- a/src/strings/ru.json
+++ b/src/strings/ru.json
@@ -1450,5 +1450,6 @@
     "CopyStreamURLSuccess": "URL  скопирован успешно.",
     "MusicLibraryHelp": "Просмотрите {0}руководство по именованию музыки{1}.",
     "FetchingData": "Выборка дополнительных данных",
-    "ButtonAddImage": "Добавить рисунок"
+    "ButtonAddImage": "Добавить рисунок",
+    "HeaderFavoritePeople": "Избранные люди"
 }
diff --git a/src/strings/sl-si.json b/src/strings/sl-si.json
index 25f611793a..2840cfb60d 100644
--- a/src/strings/sl-si.json
+++ b/src/strings/sl-si.json
@@ -311,7 +311,7 @@
     "HeaderSelectServerCachePath": "Izberite pot predpomnjenih podatkov",
     "HeaderSelectServer": "Izberi strežnik",
     "HeaderSelectPath": "Izberi pot",
-    "HeaderSelectMetadataPathHelp": "Poiščite ali vnesite pot, v kateri bi želeli shranjevati metapodatke. Datoteka mora omogočati pisanje.",
+    "HeaderSelectMetadataPathHelp": "Poiščite ali vnesite pot, v kateri želite shranjevati metapodatke. Datoteka mora omogočati pisanje.",
     "HeaderSelectMetadataPath": "Izberi pot metapodatkov",
     "HeaderSelectCertificatePath": "Izberi pot certifikata",
     "HeaderSecondsValue": "{0} sekund",
@@ -352,7 +352,7 @@
     "HeaderMyMediaSmall": "Moja predstavnost (majhno)",
     "HeaderMyMedia": "Moja predstavnost",
     "HeaderMyDevice": "Moja naprava",
-    "HeaderMusicVideos": "Glasbeni videi",
+    "HeaderMusicVideos": "Glasbeni video posnetki",
     "HeaderMusicQuality": "Kvaliteta glasbe",
     "HeaderMovies": "Filmi",
     "HeaderMoreLikeThis": "Več tega",
@@ -607,7 +607,7 @@
     "LabelAutomaticallyRefreshInternetMetadataEvery": "Samodejno posodobi metapodatke z interneta:",
     "Label3DFormat": "Format 3D:",
     "LabelAccessDay": "Dan v tednu:",
-    "LabelAccessEnd": "Čas konca:",
+    "LabelAccessEnd": "Ura konca:",
     "LabelAccessStart": "Čas začetka:",
     "LabelAirDays": "Dnevi predvajanja:",
     "LabelAirTime": "Čas predvajanja:",
@@ -653,5 +653,25 @@
     "LabelDeathDate": "Datum smrti:",
     "LabelBitrate": "Bitna hitrost:",
     "LabelBlastMessageInterval": "Interval sporočila o dostopnosti (sekunde)",
-    "LabelDefaultUserHelp": "Določi knjižnica katerega uporabnika bo prikazana na povezanih napravah. To lahko preglasite s profili za posamezno napravo."
+    "LabelDefaultUserHelp": "Določi knjižnica katerega uporabnika bo prikazana na povezanih napravah. To lahko preglasite s profili za posamezno napravo.",
+    "LabelEnableDlnaClientDiscoveryIntervalHelp": "Določi trajanje v sekundah med SSDP iskanji, ki jih izvede Jellyfin.",
+    "LabelEnableDlnaClientDiscoveryInterval": "Interval odkrivanja sprejemnikov (sekunde)",
+    "LabelEnableBlastAliveMessagesHelp": "Omogočite, če imajo UPnP naprave težave z zaznavanjem strežnika v omrežju.",
+    "LabelEnableBlastAliveMessages": "Oddajaj sporočila o dostopnosti",
+    "LabelEnableAutomaticPortMapHelp": "Poskuša avtomatično povezati javna vrata z lokalnimi preko UPnP. To ne deluje z nekaterimi usmerjevalniki.",
+    "LabelEnableAutomaticPortMap": "Omogoči avtomatično mapiranje vrat",
+    "LabelEmbedAlbumArtDidl": "Vdelaj grafike albuma v Didl",
+    "LabelEasyPinCode": "Enostavna PIN koda:",
+    "LabelDropImageHere": "Povleci in spusti sliko sem, klikni za brskanje.",
+    "LabelDownloadLanguages": "Jeziki za prenos:",
+    "LabelDownMixAudioScaleHelp": "Ojačaj jakost zvoka pri pretvarjanju v manj kanalov. Vrednost 1 ohrani izvirno glasnost.",
+    "LabelDownMixAudioScale": "Ojačanje zvoka pri pretvarjanju v manj kanalov:",
+    "LabelDisplaySpecialsWithinSeasons": "Prikaži posebne epizode znotraj sezon v katerih so bile predvajane",
+    "LabelDisplayOrder": "Vrstni red prikaza:",
+    "LabelDisplayName": "Prikazano ime:",
+    "LabelDisplayMode": "Način prikaza:",
+    "LabelBindToLocalNetworkAddressHelp": "Neobvezno. Preglasi lokalni IP naslov za povezavo s HTTP strežnikom. V kolikor pustite prazno se strežnik poveže z vsemi možnimi naslovi. Sprememba vrednosti zahteva ponovni zagon Jellyfin strežnika.",
+    "InstallingPackage": "Nameščanje {0}",
+    "ImportMissingEpisodesHelp": "Če je omogočeno, bodo podatki o manjkajočih epizodah dodani v Jellyfin bazo podatkov in prikazani znotraj sezon in serij. To lahko občutno podaljša uvoz v knjižnjico.",
+    "ImportFavoriteChannelsHelp": "Če je omogočeno, bodo uvoženi zgolj kanali, ki so na sprejemniku označeni kot priljubljeni."
 }
diff --git a/src/strings/tr.json b/src/strings/tr.json
index f517eb10e9..a9e2f76249 100644
--- a/src/strings/tr.json
+++ b/src/strings/tr.json
@@ -53,7 +53,7 @@
     "FolderTypeBooks": "Kitaplar",
     "FolderTypeMovies": "Filmler",
     "FolderTypeMusic": "Müzik",
-    "FolderTypeMusicVideos": "Müzik videoları",
+    "FolderTypeMusicVideos": "Müzik Videoları",
     "FolderTypeTvShows": "TV",
     "Friday": "Cuma",
     "HeaderActiveRecordings": "Aktif Kayıtlar",
@@ -82,7 +82,7 @@
     "HeaderRecentlyPlayed": "Son oynatılan",
     "HeaderRemoteControl": "Uzaktan Kontrol",
     "HeaderResponseProfile": "Profil Görüntüleme",
-    "HeaderScenes": "Diziler",
+    "HeaderScenes": "Sahneler",
     "HeaderSendMessage": "Mesaj Gönder",
     "HeaderSeries": "Series",
     "HeaderServerSettings": "Sunucu ayarları",
@@ -102,10 +102,10 @@
     "LabelCurrentPassword": "Kullanımdaki şifre:",
     "LabelDay": "Gün:",
     "LabelDisplayMissingEpisodesWithinSeasons": "Sezondaki kayıp bölümleri göster",
-    "LabelEnableDlnaServer": "DLNA Sunucusu etkin",
+    "LabelEnableDlnaServer": "DLNA Sunucusunu Etkinleştir",
     "LabelFinish": "Bitir",
-    "LabelIconMaxHeight": "İkon Max Genişlik:",
-    "LabelIconMaxWidth": "ikon Max Yükseklik:",
+    "LabelIconMaxHeight": "İkon Maksimum Yükseklik:",
+    "LabelIconMaxWidth": "ikon Maksimum Genişlik:",
     "LabelLanguage": "Dil:",
     "LabelManufacturer": "Üretici",
     "LabelMaxParentalRating": "Maksimum izin verilen ebeveyn değerlendirmesi:",
@@ -132,7 +132,7 @@
     "LabelYear": "Yıl:",
     "LabelYourFirstName": "İlk Ad:",
     "LabelYoureDone": "Bitti!",
-    "LibraryAccessHelp": "Bu kullanıcı ile paylaşmak için medya klasörleri seçin. Yöneticiler meta yöneticisini kullanarak tüm klasörleri düzenlemesi mümkün olacaktır.",
+    "LibraryAccessHelp": "Bu kullanıcı ile paylaşmak için kütüphaneleri seçin. Yöneticiler meta yöneticisini kullanarak tüm klasörleri düzenlemesi mümkün olacaktır.",
     "Live": "Canlı",
     "MaxParentalRatingHelp": "Daha yüksek bir derece ile İçerik Bu kullanıcıdan gizli olacak.",
     "MessageNothingHere": "Burada birşey yok.",
@@ -555,5 +555,143 @@
     "EnableThemeSongsHelp": "Kitaplığa göz atarken tema şarkıları arka planda çalın.",
     "EnableThemeSongs": "Tema şarkıları",
     "EnableStreamLoopingHelp": "Canlı akışlar yalnızca birkaç saniye veri içeriyorsa ve sürekli istenmesi gerekiyorsa bunu etkinleştirin. Gerekmediğinde bunu etkinleştirmek sorunlara neden olabilir.",
-    "EnableStreamLooping": "Otomatik döngü canlı akışları"
+    "EnableStreamLooping": "Otomatik döngü canlı akışları",
+    "Hide": "Gizle",
+    "HeaderVideos": "Videolar",
+    "HeaderVideoTypes": "Video Tipleri",
+    "HeaderVideoType": "Video Tipi",
+    "HeaderVideoQuality": "Video Kalitesi",
+    "HeaderSelectServerCachePath": "Sunucu Önbellek Yolunu Seç",
+    "HeaderSelectServer": "Sunucu Seç",
+    "HeaderSelectPath": "Yolu Seç",
+    "HeaderSelectMetadataPath": "Meta Verisi Yolunu Seç",
+    "HeaderSelectCertificatePath": "Sertifika Yolunu Seç",
+    "HeaderSecondsValue": "{0} Saniye",
+    "HeaderSeasons": "Sezonlar",
+    "HeaderSchedule": "Zamanla",
+    "HeaderRunningTasks": "Çalışan Görevler",
+    "HeaderRevisionHistory": "Revizyon Geçmişi",
+    "HeaderRestartingServer": "Sunucu Yeniden Başlıyor",
+    "HeaderRestart": "Yeniden Başlat",
+    "HeaderRemoveMediaLocation": "Medya Konumunu Kaldır",
+    "HeaderRemoveMediaFolder": "Medya Klasörünü Kaldır",
+    "HeaderRecordingPostProcessing": "Kayıt Sonrası İşlemesi",
+    "HeaderRecordingOptions": "Kayıt Ayarları",
+    "HeaderProfileInformation": "Profil Bilgileri",
+    "HeaderProfile": "Profil",
+    "HeaderPluginInstallation": "Eklenti Kurulumu",
+    "HeaderPlaybackError": "Oynatma Hatası",
+    "HeaderPlayback": "Medya Oynatma",
+    "HeaderPinCodeReset": "Pin Kodunu Sıfırla",
+    "HeaderPhotoAlbums": "Fotoğraf Albümleri",
+    "HeaderPeople": "Kişiler",
+    "HeaderPendingInvitations": "Bekleyen Davetiyeler",
+    "HeaderPasswordReset": "Şifre Sıfırlama",
+    "HeaderPassword": "Şifre",
+    "HeaderParentalRatings": "Ebeveyn Derecelendirmeleri",
+    "HeaderOtherItems": "Diğer Öğeler",
+    "HeaderOnNow": "Şimdi",
+    "HeaderNextVideoPlayingInValue": "Sonraki Video Başlıyor {0}",
+    "HeaderNextEpisodePlayingInValue": "Sonraki Bölüm {0}",
+    "HeaderNewDevices": "Yeni Cihazlar",
+    "HeaderNewApiKey": "Yeni API Anahtarı",
+    "HeaderMyMediaSmall": "Benim Medyam (küçük)",
+    "HeaderMyMedia": "Benim Medyam",
+    "HeaderMyDevice": "Benim Cihazım",
+    "HeaderMusicQuality": "Müzik Kalitesi",
+    "HeaderMovies": "Filmler",
+    "HeaderMoreLikeThis": "Buna Benzer Daha Fazla",
+    "HeaderMetadataSettings": "Meta Verisi Ayarları",
+    "HeaderMediaInfo": "Medya Bilgisi",
+    "HeaderMedia": "Medya",
+    "HeaderLoginFailure": "Giriş Başarısız",
+    "HeaderLiveTvTunerSetup": "Canlı TV istasyon Kurulumu",
+    "HeaderLiveTv": "Canlı TV",
+    "HeaderLibrarySettings": "Kütüphane Ayarları",
+    "HeaderLibraryOrder": "Kütüphane Sırası",
+    "HeaderLibraryAccess": "Kütüphane Erişimi",
+    "HeaderLibraries": "Kütüphaneler",
+    "HeaderLatestMusic": "Son Müzik",
+    "HeaderKeepSeries": "Seriyi Sakla",
+    "HeaderKeepRecording": "Kaydı Sakla",
+    "HeaderItems": "Öğeler",
+    "HeaderInstall": "Yükle",
+    "HeaderImageOptions": "Resim Seçenekleri",
+    "HeaderIdentifyItemHelp": "Bir veya daha fazla arama kriteri giriniz. Faha fazla arama sonucu için kriter kaldırın.",
+    "HeaderIdentificationHeader": "Kimlik Başlığı",
+    "HeaderIdentificationCriteriaHelp": "En az bir kimlik kriteri girmelisiniz.",
+    "HeaderIdentification": "Kimlik",
+    "HeaderHttpHeaders": "HTTP Başlıkları",
+    "HeaderHome": "Ana Sayfa",
+    "HeaderFavoritePeople": "Favori Kişiler",
+    "LabelEnableAutomaticPortMap": "Otomatik port eşleştirmeyi etkinleştir",
+    "LabelEasyPinCode": "Basit pin kodu:",
+    "LabelDropImageHere": "Görüntüyü buraya bırakın veya göz atmak için tıklayın.",
+    "LabelDownloadLanguages": "Dilleri indir:",
+    "LabelDisplayOrder": "Görüntüleme sırası:",
+    "LabelDisplayName": "Ekran adı:",
+    "LabelDisplayMode": "Ekran modu:",
+    "LabelDisplayLanguageHelp": "Jellyfin çevirisi devam eden bir projedir.",
+    "LabelDisplayLanguage": "Ekran dili:",
+    "LabelDiscNumber": "Disk no:",
+    "LabelDeviceDescription": "Sürücü açıklaması",
+    "LabelDefaultUser": "Varsayılan kullanıcı:",
+    "LabelDefaultScreen": "Varsayılan ekran:",
+    "LabelDeathDate": "Ölüm tarihi:",
+    "LabelDateTimeLocale": "Tarih saat yerelleştirme:",
+    "LabelDateAdded": "Eklenme tarihi:",
+    "LabelCustomCss": "Özel CSS:",
+    "LabelCommunityRating": "Topluluk değerlendirmesi:",
+    "LabelCertificatePassword": "Sertifika şifresi:",
+    "LabelCache": "Önbellek:",
+    "LabelBitrate": "Bit Hızı:",
+    "LabelBirthYear": "Doğum yılı:",
+    "LabelBirthDate": "Doğum tarihi:",
+    "LabelAuthProvider": "Kimlik Doğrulama Sağlayıcısı:",
+    "LabelAudioSampleRate": "Ses örnekleme hızı:",
+    "LabelAudioCodec": "Ses kodeği:",
+    "LabelAudioChannels": "Ses kanalları:",
+    "LabelAudio": "Ses:",
+    "LabelAppName": "Uygulama adı",
+    "LabelAllowHWTranscoding": "Donanım kod dönüştürmesine izin ver",
+    "LabelAll": "Tümü",
+    "LabelAlbumArtMaxWidth": "Albüm resmi maks. genişlik:",
+    "LabelAlbumArtMaxHeight": "Albüm resmi maks. yükseklik:",
+    "LabelAlbum": "Albüm:",
+    "LabelAccessStart": "Başlangıç zamanı:",
+    "LabelAccessEnd": "Bitiş zamanı:",
+    "LabelAccessDay": "Haftanın Günü:",
+    "LabelAbortedByServerShutdown": "(Sunucu kapanması nedeniyle iptal edildi)",
+    "Label3DFormat": "3D Formatı:",
+    "Kids": "Çocuklar",
+    "ItemCount": "{0} nesne",
+    "InstallingPackage": "Yükleniyor {0}",
+    "Images": "Resimler",
+    "Identify": "Tanımla",
+    "Horizontal": "Yatay",
+    "Help": "Yardım",
+    "HeadersFolders": "Klasörler",
+    "HeaderYears": "Yıl",
+    "HeaderXmlSettings": "Xml Ayarları",
+    "HeaderXmlDocumentAttributes": "Xml Döküman Öznitelikleri",
+    "HeaderXmlDocumentAttribute": "Xml Dökümanı Öznitelik",
+    "HeaderUser": "Kullanıcı",
+    "HeaderUploadImage": "Resim Yükle",
+    "HeaderUpcomingOnTV": "TV'de Yaklaşan",
+    "HeaderTypeText": "Metin Gir",
+    "HeaderTunerDevices": "Tuner Cihazları",
+    "HeaderThisUserIsCurrentlyDisabled": "Bu kullanıcı şu anda pasif",
+    "HeaderTags": "Etiketler",
+    "HeaderSubtitleProfiles": "Altyazı Profilleri",
+    "HeaderSubtitleProfile": "Altyazı Profili",
+    "HeaderSubtitleDownloads": "Altyazı İndirmeleri",
+    "HeaderStopRecording": "Kaydı Durdur",
+    "HeaderStartNow": "Şimdi Başlat",
+    "HeaderSpecialFeatures": "Ekstra Özellikler",
+    "HeaderSpecialEpisodeInfo": "Özel Bölüm Bilgisi",
+    "HeaderSortOrder": "Sıralama Düzeni",
+    "HeaderSortBy": "Sırala",
+    "HeaderShutdown": "Kapat",
+    "HeaderSettings": "Ayarlar",
+    "LabelLogs": "Günlük:"
 }
diff --git a/src/strings/zh-cn.json b/src/strings/zh-cn.json
index 749a5b0a8a..eb3e6a8181 100644
--- a/src/strings/zh-cn.json
+++ b/src/strings/zh-cn.json
@@ -498,7 +498,7 @@
     "LabelBurnSubtitles": "烧录字幕：",
     "LabelCache": "缓存：",
     "LabelCachePath": "缓存路径：",
-    "LabelCachePathHelp": "指定服务器缓存文件的自定义路径，比如图片。留空将使用服务器默认。",
+    "LabelCachePathHelp": "指定服务器缓存文件（如图片）的自定义路径。留空将使用服务器默认。",
     "LabelCancelled": "已取消",
     "LabelCertificatePassword": "证书密码：",
     "LabelCertificatePasswordHelp": "如果你的证书需要密码，请在此输入它。",
@@ -585,7 +585,7 @@
     "LabelHomeNetworkQuality": "家庭网络质量：",
     "LabelHomeScreenSectionValue": "主屏幕模块{0}:",
     "LabelHttpsPort": "本地 HTTPS 端口号：",
-    "LabelHttpsPortHelp": "Jellyfin HTTPS 服务器监听的 TCP 端口。",
+    "LabelHttpsPortHelp": "Jellyfin HTTPS 服务器监听端口。",
     "LabelIconMaxHeight": "图标最大高度：",
     "LabelIconMaxHeightHelp": "通过UPnP显示的图标最大分辨率。",
     "LabelIconMaxWidth": "图标最大宽度：",
@@ -595,12 +595,12 @@
     "LabelImageType": "图片类型：",
     "LabelImportOnlyFavoriteChannels": "限制标记频道为我的最爱",
     "LabelInNetworkSignInWithEasyPassword": "启用简易PIN码登录家庭网络",
-    "LabelInNetworkSignInWithEasyPasswordHelp": "如果启动该选项，你将可以在你的家庭网络中使用你的简易 PIN 码登录 Jellyfin 应用程序。仅在你使用外部网络时才需要输入常规密码。如果 PIN 码留空，那么在你的家庭网络中，你将不需要输入密码。",
+    "LabelInNetworkSignInWithEasyPasswordHelp": "在你的本地网络中使用简易 PIN 码登录客户端，如果 PIN 码留空，那么在本地网络中则不需要输入密码。外部网络中需要输入常规密码登陆。",
     "LabelInternetQuality": "网络质量：",
     "LabelKidsCategories": "儿童分类：",
     "LabelKodiMetadataDateFormat": "发行日期格式：",
     "LabelKodiMetadataDateFormatHelp": "Nfo的所有日期将使用这种格式。",
-    "LabelKodiMetadataEnableExtraThumbs": "复制同人画到extrathumbs文件夹",
+    "LabelKodiMetadataEnableExtraThumbs": "复制同人画到extrathumbs目录",
     "LabelKodiMetadataEnableExtraThumbsHelp": "为了最大化兼容Kodi皮肤，下载的图片同时保存在 extrafanart 和 extrathumbs 文件夹。",
     "LabelKodiMetadataEnablePathSubstitution": "启用路径替换",
     "LabelKodiMetadataEnablePathSubstitutionHelp": "允许图像的路径替换使用服务器的路径替换设置。",
@@ -724,7 +724,7 @@
     "LabelSerialNumber": "序列号",
     "LabelSeriesRecordingPath": "电视剧录制路径 (可选的)：",
     "LabelServerHost": "主机：",
-    "LabelServerHostHelp": "192.168.1.100 或 https://myserver.com",
+    "LabelServerHostHelp": "192.168.1.100:8096 或 https://myserver.com",
     "LabelSimultaneousConnectionLimit": "并发流限制：",
     "LabelSkin": "皮肤：",
     "LabelSkipBackLength": "跳过长度：",
@@ -764,7 +764,7 @@
     "LabelTrackNumber": "音轨号码：",
     "LabelTranscodingAudioCodec": "音频编解码器：",
     "LabelTranscodingContainer": "容器：",
-    "LabelTranscodingTempPathHelp": "此文件夹包含用于转码的工作文件。请自定义路径，或留空以使用默认的服务器数据文件夹。",
+    "LabelTranscodingTempPathHelp": "设置转码文件存储目录。留空以使用服务器默认文件夹。",
     "LabelTranscodingThreadCount": "转码线程数：",
     "LabelTranscodingThreadCountHelp": "选择转码时使用的最大线程数。\n减少线程数量将会降低CPU使用率，可能无法快速进行转换并流畅的播放。",
     "LabelTranscodingVideoCodec": "视频编解码器：",
@@ -779,7 +779,7 @@
     "LabelUserAgent": "用户代理:",
     "LabelUserLibrary": "用户程序库：",
     "LabelUserLibraryHelp": "选择一个在设备上显示的用户媒体库。留空则使用默认设置。",
-    "LabelUserRemoteClientBitrateLimitHelp": "这将会覆盖服务器“播放”设置中为全局设置的默认值。",
+    "LabelUserRemoteClientBitrateLimitHelp": "覆盖服务器“播放”设置的全局默认值。",
     "LabelUsername": "用户名：",
     "LabelVaapiDevice": "VA API 设备：",
     "LabelVaapiDeviceHelp": "此渲染节点用来硬件加速。",
@@ -801,7 +801,7 @@
     "Large": "大",
     "LatestFromLibrary": "最新的{0}",
     "LearnHowYouCanContribute": "学习如何构建。",
-    "LibraryAccessHelp": "选择共享给此用户的媒体文件夹。管理员能使用媒体资料管理器来编辑所有文件夹。",
+    "LibraryAccessHelp": "选择共享给此用户的媒体库。管理员有权使用媒体资料管理器来编辑所有文件夹。",
     "Like": "喜欢",
     "List": "列表",
     "Live": "直播",
@@ -845,20 +845,20 @@
     "MessageConfirmRemoveMediaLocation": "你确定要移除此位置？",
     "MessageConfirmRestart": "你确定要重启 Jellyfin 服务端？",
     "MessageConfirmRevokeApiKey": "你确定你希望撤销这个 API 秘钥吗？这个应用程序与 Jellyfin 服务器的连接将会被立刻中断。",
-    "MessageConfirmShutdown": "你确定要关闭 Jellyfin 服务端？",
+    "MessageConfirmShutdown": "你确定要关闭服务端？",
     "MessageContactAdminToResetPassword": "请联系你的管理员以重置你的密码。",
     "MessageCreateAccountAt": "在 {0} 创建帐户",
     "MessageDeleteTaskTrigger": "你确定删除这个任务触发条件？",
     "MessageDirectoryPickerBSDInstruction": "对于 BSD 系统，你需要设置包含你的 FreeNAS Jail 虚拟机的存储以允许 Jellyfin 访问它。",
     "MessageDirectoryPickerInstruction": "网络按钮无法找到你的设备的情况下，网络路径可以手动输入。 例如， {0} 或者 {1}。",
-    "MessageDirectoryPickerLinuxInstruction": "对于 Arch Linux 上的 Linux 或是 CentOS、Debian、Fedora、OpenSuse、Ubuntu 这些系统，你必须授权 Jellyfin 系统用户至少拥有你存储位置的读取权限。",
+    "MessageDirectoryPickerLinuxInstruction": "对于 Arch Linux 上的 Linux 或是 CentOS、Debian、Fedora、OpenSuse、Ubuntu 这些系统，你必须授权系统服务用户访问你存储位置的权限。",
     "MessageDownloadQueued": "下载已列队。",
     "MessageEnablingOptionLongerScans": "启用此选项可能会大大延长媒体库扫描时间。",
     "MessageFileReadError": "读取文件发生错误。",
     "MessageForgotPasswordFileCreated": "已在服务器上创建了以下文件, 并包含有关后续步骤说明:",
     "MessageForgotPasswordInNetworkRequired": "请连接你的家庭网络后再试一次以开始密码重置流程。",
     "MessageInstallPluginFromApp": "这个插件必须从你打算使用的应用程序中安装。",
-    "MessageInvalidForgotPasswordPin": "你输入了一个无效的或过期的 pin 码。请再试一次。",
+    "MessageInvalidForgotPasswordPin": "无效的或过期的 pin 码。请再试一次。",
     "MessageInvalidUser": "用户名或密码不可用。请重试。",
     "MessageItemSaved": "项目已保存。",
     "MessageItemsAdded": "项目已添加。",
@@ -875,7 +875,7 @@
     "MessagePluginInstallDisclaimer": "安装 Jellyfin 社区成员构建的插件来获取额外的功能是增强你的 Jellyfin 体验的一种很好的方式。但在安装之前请意识到他们可能会对你的 Jellyfin 服务器造成的影响，如更长的媒体库扫描时间、额外的背景数据加工、降低系统稳定性等。",
     "MessageReenableUser": "请参阅以下以重新启用",
     "MessageSettingsSaved": "设置已保存。",
-    "MessageTheFollowingLocationWillBeRemovedFromLibrary": "以下媒体路径将从你的 Jellyfin 媒体库移除：",
+    "MessageTheFollowingLocationWillBeRemovedFromLibrary": "以下媒体路径将从你的媒体库移除：",
     "MessageUnableToConnectToServer": "现在无法连接所选择的服务器，请确保该服务器目前正在运行。",
     "MessageUnsetContentHelp": "内容将显示为纯文件夹。为取得最佳效果, 请使用元数据管理器设置子文件夹的内容类型。",
     "MessageYouHaveVersionInstalled": "你目前安装了 {0} 版本。",
@@ -884,13 +884,13 @@
     "MetadataSettingChangeHelp": "更改元数据设置将影响添加的新内容。要刷新现有内容, 请打开详细信息屏幕并单击 \"刷新\" 按钮, 或使用元数据管理器执行批量刷新。",
     "MinutesAfter": "分钟后",
     "MinutesBefore": "分钟前",
-    "Mobile": "手机/平板",
+    "Mobile": "移动设备",
     "Monday": "星期一",
     "MoreFromValue": "更多来自 {0}",
     "MoreUsersCanBeAddedLater": "稍后可以在控制台中添加更多用户。",
     "MoveLeft": "左移",
     "MoveRight": "右移",
-    "MovieLibraryHelp": "回顾{0}Jellyfin 电影命名指南{1}。",
+    "MovieLibraryHelp": "回顾{0}电影命名指南{1}。",
     "Movies": "电影",
     "Mute": "静音",
     "MySubtitles": "我的字幕",
@@ -917,7 +917,7 @@
     "OneChannel": "一个频道",
     "OnlyForcedSubtitles": "只显示强制字幕",
     "OnlyForcedSubtitlesHelp": "只有被标记为“强制”的字幕会被加载。",
-    "OnlyImageFormats": "仅图像格式（VOBSUB, PGS, SUB/IDX 等）",
+    "OnlyImageFormats": "仅图像格式（VOBSUB, PGS, SUB等）",
     "OptionAdminUsers": "管理员",
     "OptionAlbum": "专辑",
     "OptionAlbumArtist": "专辑艺术家",
@@ -932,7 +932,7 @@
     "OptionAllowMediaPlaybackTranscodingHelp": "由于不支持的媒体格式, 限制对代码转换的访问可能会导致 Jellyfin 应用程序中的播放失败。",
     "OptionAllowRemoteControlOthers": "允许其他用户全程控制",
     "OptionAllowRemoteSharedDevices": "允许远程控制共享的设备",
-    "OptionAllowRemoteSharedDevicesHelp": "DLNA 在有用户对它进行控制前设备被视为是共享的。",
+    "OptionAllowRemoteSharedDevicesHelp": "DLNA 设备在用户对他们进行控制前都被视为是共享的。",
     "OptionAllowSyncTranscoding": "允许需要转码的媒体下载和同步",
     "OptionAllowUserToManageServer": "运行此用户管理服务器",
     "OptionAllowVideoPlaybackRemuxing": "允许播放需转换但无需重新编码的视频",
@@ -966,7 +966,7 @@
     "OptionDisableUserHelp": "如果禁用该用户，服务器将不允许该用户连接。现有的连接将被终止。",
     "OptionDislikes": "不喜欢",
     "OptionDisplayFolderView": "显示一个“文件夹”类别用于按文件夹分类浏览你的媒体文件夹",
-    "OptionDisplayFolderViewHelp": "如果启用此项，Jellyfin 应用程序将在你的媒体库列表中显示一个“文件夹”类别。如果你有按文件夹分类进行浏览的需求，这个功能将是有帮助的。",
+    "OptionDisplayFolderViewHelp": "在你的媒体库列表中显示文件夹。如果你有按文件夹分类进行浏览的需求，这会非常有用。",
     "OptionDownloadArtImage": "艺术图",
     "OptionDownloadBackImage": "包装背面",
     "OptionDownloadBannerImage": "横幅",
diff --git a/src/userprofiles.html b/src/userprofiles.html
index bfa8c2e8e4..6fa5f058ce 100644
--- a/src/userprofiles.html
+++ b/src/userprofiles.html
@@ -6,7 +6,7 @@
                 <div class="sectionTitleContainer sectionTitleContainer-cards">
                     <h2 class="sectionTitle sectionTitle-cards">${HeaderUsers}</h2>
                     <button is="emby-button" type="button" class="fab btnAddUser submit sectionTitleButton" style="margin-left:1em;" title="${ButtonAddUser}">
-                        <i class="md-icon">&#xE145;</i>
+                        <i class="md-icon">add</i>
                     </button>
                     <a style="margin-left:2em!important;" is="emby-linkbutton" class="raised button-alt headerHelpButton" target="_blank" href="https://docs.jellyfin.org/general/server/users.html">${Help}</a>
                 </div>
@@ -21,4 +21,4 @@
         </div>
 
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/videoosd.html b/src/videoosd.html
index 34c73a3019..0c7a910908 100644
--- a/src/videoosd.html
+++ b/src/videoosd.html
@@ -1,4 +1,4 @@
-<div id="videoOsdPage" data-role="page" class="page libraryPage" data-backbutton="true">    
+<div id="videoOsdPage" data-role="page" class="page libraryPage" data-backbutton="true">
     <div class="pageContainer flex">
 
     </div>
@@ -33,51 +33,51 @@
 
             <div class="buttons focuscontainer-x">
                 <button is="paper-icon-button-light" class="btnRecord autoSize hide">
-                    <i class="xlargePaperIconButton md-icon">&#xE061;</i>
+                    <i class="xlargePaperIconButton md-icon">fiber_manual_record</i>
                 </button>
 
                 <button is="paper-icon-button-light" class="btnPreviousTrack autoSize hide">
-                    <i class="xlargePaperIconButton md-icon">&#xE045;</i>
+                    <i class="xlargePaperIconButton md-icon">skip_previous</i>
                 </button>
 
                 <button is="paper-icon-button-light" class="btnRewind" title="${Rewind} (j)">
-                    <i class="xlargePaperIconButton md-icon">&#xE020;</i>
+                    <i class="xlargePaperIconButton md-icon">fast_rewind</i>
                 </button>
 
                 <button is="paper-icon-button-light" class="btnPause autoSize">
-                    <i class="xlargePaperIconButton md-icon">&#xE034;</i>
+                    <i class="xlargePaperIconButton md-icon">pause</i>
                 </button>
 
                 <button is="paper-icon-button-light" class="btnFastForward" title="${FastForward} (l)">
-                    <i class="xlargePaperIconButton md-icon">&#xE01F;</i>
+                    <i class="xlargePaperIconButton md-icon">fast_forward</i>
                 </button>
 
                 <button is="paper-icon-button-light" class="btnNextTrack autoSize hide">
-                    <i class="xlargePaperIconButton md-icon">&#xE044;</i>
+                    <i class="xlargePaperIconButton md-icon">skip_next</i>
                 </button>
 
                 <button is="paper-icon-button-light" class="btnAudio hide autoSize" title="${Audio}">
-                    <i class="xlargePaperIconButton md-icon">&#xE3A1;</i>
+                    <i class="xlargePaperIconButton md-icon">audiotrack</i>
                 </button>
                 <button is="paper-icon-button-light" class="btnSubtitles hide autoSize" title="${Subtitles}">
-                    <i class="xlargePaperIconButton md-icon">&#xE01C;</i>
+                    <i class="xlargePaperIconButton md-icon">closed_caption</i>
                 </button>
 
                 <button is="paper-icon-button-light" class="btnVideoOsdSettings hide autoSize" title="${Settings}">
-                    <i class="largePaperIconButton md-icon">&#xE8B8;</i>
+                    <i class="largePaperIconButton md-icon">settings</i>
                 </button>
                 <button is="paper-icon-button-light" class="btnFullscreen hide autoSize" title="${Fullscreen} (f)">
-                    <i class="xlargePaperIconButton md-icon">&#xE5D0;</i>
+                    <i class="xlargePaperIconButton md-icon">fullscreen</i>
                 </button>
                 <button is="paper-icon-button-light" class="btnPip hide autoSize" title="${PictureInPicture}">
-                    <i class="xlargePaperIconButton md-icon">&#xE911;</i>
+                    <i class="xlargePaperIconButton md-icon">picture_in_picture_alt</i>
                 </button>
 
                 <div class="osdTimeText"><span class="osdPositionText"></span><span class="osdDurationText"></span><span class="endsAtText"></span></div>
 
                 <div class="volumeButtons hide-mouse-idle-tv">
                     <button is="paper-icon-button-light" class="buttonMute autoSize" title="${Mute} (m)">
-                        <i class="xlargePaperIconButton md-icon">&#xE050;</i>
+                        <i class="xlargePaperIconButton md-icon">volume_up</i>
                     </button>
                     <div class="sliderContainer osdVolumeSliderContainer">
                         <input is="emby-slider" type="range" step="1" min="0" max="100" value="0" class="osdVolumeSlider" />