diff --git a/src/components/actionSheet/actionSheet.js b/src/components/actionSheet/actionSheet.js
index 3e9b237873..bf8b158458 100644
--- a/src/components/actionSheet/actionSheet.js
+++ b/src/components/actionSheet/actionSheet.js
@@ -142,7 +142,7 @@ export function show(options) {
 
     if (layoutManager.tv) {
         html += `<button is="paper-icon-button-light" class="btnCloseActionSheet hide-mouse-idle-tv" tabindex="-1">
-                     <span class="material-icons arrow_back"></span>
+                     <span class="material-icons arrow_back" aria-hidden="true"></span>
                  </button>`;
     }
 
@@ -204,9 +204,9 @@ export function show(options) {
         itemIcon = icons[i];
 
         if (itemIcon) {
-            html += `<span class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent material-icons ${itemIcon}"></span>`;
+            html += `<span class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent material-icons ${itemIcon}" aria-hidden="true"></span>`;
         } else if (renderIcon && !center) {
-            html += '<span class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent material-icons check" style="visibility:hidden;"></span>';
+            html += '<span class="actionsheetMenuItemIcon listItemIcon listItemIcon-transparent material-icons check" aria-hidden="true" style="visibility:hidden;"></span>';
         }
 
         html += '<div class="listItemBody actionsheetListItemBody">';
diff --git a/src/components/activitylog.js b/src/components/activitylog.js
index bc7d13696d..dab5633f7d 100644
--- a/src/components/activitylog.js
+++ b/src/components/activitylog.js
@@ -23,12 +23,12 @@ import alert from './alert';
         }
 
         if (entry.UserId && entry.UserPrimaryImageTag) {
-            html += '<span class="listItemIcon material-icons dvr" style="width:2em!important;height:2em!important;padding:0;color:transparent;background-color:' + color + ";background-image:url('" + apiClient.getUserImageUrl(entry.UserId, {
+            html += '<span class="listItemIcon material-icons dvr" aria-hidden="true" style="width:2em!important;height:2em!important;padding:0;color:transparent;background-color:' + color + ";background-image:url('" + apiClient.getUserImageUrl(entry.UserId, {
                 type: 'Primary',
                 tag: entry.UserPrimaryImageTag
             }) + "');background-repeat:no-repeat;background-position:center center;background-size: cover;\"></span>";
         } else {
-            html += '<span class="listItemIcon material-icons ' + icon + '" style="background-color:' + color + '"></span>';
+            html += '<span class="listItemIcon material-icons ' + icon + '" aria-hidden="true" style="background-color:' + color + '"></span>';
         }
 
         html += '<div class="listItemBody three-line">';
@@ -45,7 +45,7 @@ import alert from './alert';
 
         if (entry.Overview) {
             html += `<button type="button" is="paper-icon-button-light" class="btnEntryInfo" data-id="${entry.Id}" title="${globalize.translate('Info')}">
-                       <span class="material-icons info"></span>
+                       <span class="material-icons info" aria-hidden="true"></span>
                     </button>`;
         }
 
diff --git a/src/components/alphaPicker/alphaPicker.js b/src/components/alphaPicker/alphaPicker.js
index 96d72f96e7..1579ef71cc 100644
--- a/src/components/alphaPicker/alphaPicker.js
+++ b/src/components/alphaPicker/alphaPicker.js
@@ -75,7 +75,7 @@ import 'material-design-icons-iconfont';
 
         html += `<div class="${rowClassName}">`;
         if (options.mode === 'keyboard') {
-            html += `<button data-value=" " is="paper-icon-button-light" class="${alphaPickerButtonClassName}"><span class="material-icons alphaPickerButtonIcon space_bar"></span></button>`;
+            html += `<button data-value=" " is="paper-icon-button-light" class="${alphaPickerButtonClassName}"><span class="material-icons alphaPickerButtonIcon space_bar" aria-hidden="true"></span></button>`;
         } else {
             letters = ['#'];
             html += mapLetters(letters, vertical).join('');
@@ -85,7 +85,7 @@ import 'material-design-icons-iconfont';
         html += mapLetters(letters, vertical).join('');
 
         if (options.mode === 'keyboard') {
-            html += `<button data-value="backspace" is="paper-icon-button-light" class="${alphaPickerButtonClassName}"><span class="material-icons alphaPickerButtonIcon backspace"></span></button>`;
+            html += `<button data-value="backspace" is="paper-icon-button-light" class="${alphaPickerButtonClassName}"><span class="material-icons alphaPickerButtonIcon backspace" aria-hidden="true"></span></button>`;
             html += '</div>';
 
             letters = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js
index 17bc60818d..ff224044b8 100644
--- a/src/components/cardbuilder/cardBuilder.js
+++ b/src/components/cardbuilder/cardBuilder.js
@@ -782,7 +782,7 @@ import ServerConnections from '../ServerConnections';
 
             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"><span class="material-icons more_vert"></span></button>';
+                    html += '<button is="paper-icon-button-light" class="itemAction btnCardOptions cardText-secondary" data-action="menu"><span class="material-icons more_vert" aria-hidden="true"></span></button>';
                 }
             }
 
@@ -1301,15 +1301,15 @@ import ServerConnections from '../ServerConnections';
                 const btnCssClass = 'cardOverlayButton cardOverlayButton-br itemAction';
 
                 if (options.centerPlayButton) {
-                    overlayButtons += '<button is="paper-icon-button-light" class="' + btnCssClass + ' cardOverlayButton-centered" data-action="play"><span class="material-icons cardOverlayButtonIcon play_arrow"></span></button>';
+                    overlayButtons += '<button is="paper-icon-button-light" class="' + btnCssClass + ' cardOverlayButton-centered" data-action="play"><span class="material-icons cardOverlayButtonIcon play_arrow" aria-hidden="true"></span></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"><span class="material-icons cardOverlayButtonIcon play_arrow"></span></button>';
+                    overlayButtons += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="play"><span class="material-icons cardOverlayButtonIcon play_arrow" aria-hidden="true"></span></button>';
                 }
 
                 if (options.overlayMoreButton) {
-                    overlayButtons += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="menu"><span class="material-icons cardOverlayButtonIcon more_vert"></span></button>';
+                    overlayButtons += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="menu"><span class="material-icons cardOverlayButtonIcon more_vert" aria-hidden="true"></span></button>';
                 }
             }
 
@@ -1454,7 +1454,7 @@ import ServerConnections from '../ServerConnections';
             const 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"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover play_arrow"></span></button>';
+                html += '<button is="paper-icon-button-light" class="' + btnCssClass + ' cardOverlayFab-primary" data-action="resume"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover play_arrow" aria-hidden="true"></span></button>';
             }
 
             html += '<div class="cardOverlayButton-br flex">';
@@ -1464,7 +1464,7 @@ import ServerConnections from '../ServerConnections';
             if (itemHelper.canMarkPlayed(item)) {
                 /* eslint-disable-next-line  @babel/no-unused-expressions */
                 import('../../elements/emby-playstatebutton/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) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover check"></span></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) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover check" aria-hidden="true"></span></button>';
             }
 
             if (itemHelper.canRate(item)) {
@@ -1472,10 +1472,10 @@ import ServerConnections from '../ServerConnections';
 
                 /* eslint-disable-next-line  @babel/no-unused-expressions */
                 import('../../elements/emby-ratingbutton/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) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover favorite"></span></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) + '"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover favorite" aria-hidden="true"></span></button>';
             }
 
-            html += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="menu"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover more_vert"></span></button>';
+            html += '<button is="paper-icon-button-light" class="' + btnCssClass + '" data-action="menu"><span class="material-icons cardOverlayButtonIcon cardOverlayButtonIcon-hover more_vert" aria-hidden="true"></span></button>';
             html += '</div>';
             html += '</div>';
 
@@ -1490,36 +1490,36 @@ import ServerConnections from '../ServerConnections';
          */
         export function getDefaultText(item, options) {
             if (item.CollectionType) {
-                return '<span class="cardImageIcon material-icons ' + imageHelper.getLibraryIcon(item.CollectionType) + '"></span>';
+                return '<span class="cardImageIcon material-icons ' + imageHelper.getLibraryIcon(item.CollectionType) + '" aria-hidden="true"></span>';
             }
 
             switch (item.Type) {
                 case 'MusicAlbum':
-                    return '<span class="cardImageIcon material-icons album"></span>';
+                    return '<span class="cardImageIcon material-icons album" aria-hidden="true"></span>';
                 case 'MusicArtist':
                 case 'Person':
-                    return '<span class="cardImageIcon material-icons person"></span>';
+                    return '<span class="cardImageIcon material-icons person" aria-hidden="true"></span>';
                 case 'Audio':
-                    return '<span class="cardImageIcon material-icons audiotrack"></span>';
+                    return '<span class="cardImageIcon material-icons audiotrack" aria-hidden="true"></span>';
                 case 'Movie':
-                    return '<span class="cardImageIcon material-icons movie"></span>';
+                    return '<span class="cardImageIcon material-icons movie" aria-hidden="true"></span>';
                 case 'Episode':
                 case 'Series':
-                    return '<span class="cardImageIcon material-icons tv"></span>';
+                    return '<span class="cardImageIcon material-icons tv" aria-hidden="true"></span>';
                 case 'Book':
-                    return '<span class="cardImageIcon material-icons book"></span>';
+                    return '<span class="cardImageIcon material-icons book" aria-hidden="true"></span>';
                 case 'Folder':
-                    return '<span class="cardImageIcon material-icons folder"></span>';
+                    return '<span class="cardImageIcon material-icons folder" aria-hidden="true"></span>';
                 case 'BoxSet':
-                    return '<span class="cardImageIcon material-icons collections"></span>';
+                    return '<span class="cardImageIcon material-icons collections" aria-hidden="true"></span>';
                 case 'Playlist':
-                    return '<span class="cardImageIcon material-icons view_list"></span>';
+                    return '<span class="cardImageIcon material-icons view_list" aria-hidden="true"></span>';
                 case 'PhotoAlbum':
-                    return '<span class="cardImageIcon material-icons photo_album"></span>';
+                    return '<span class="cardImageIcon material-icons photo_album" aria-hidden="true"></span>';
             }
 
             if (options && options.defaultCardImageIcon) {
-                return '<span class="cardImageIcon material-icons ' + options.defaultCardImageIcon + '"></span>';
+                return '<span class="cardImageIcon material-icons ' + options.defaultCardImageIcon + '" aria-hidden="true"></span>';
             }
 
             const defaultName = isUsingLiveTvNaming(item) ? item.Name : itemHelper.getDisplayName(item);
@@ -1616,7 +1616,7 @@ import ServerConnections from '../ServerConnections';
                     indicatorsElem = ensureIndicators(card, indicatorsElem);
                     indicatorsElem.appendChild(playedIndicator);
                 }
-                playedIndicator.innerHTML = '<span class="material-icons indicatorIcon check"></span>';
+                playedIndicator.innerHTML = '<span class="material-icons indicatorIcon check" aria-hidden="true"></span>';
             } else {
                 playedIndicator = card.querySelector('.playedIndicator');
                 if (playedIndicator) {
@@ -1699,7 +1699,7 @@ import ServerConnections from '../ServerConnections';
                 const icon = cell.querySelector('.timerIndicator');
                 if (!icon) {
                     const indicatorsElem = ensureIndicators(cell);
-                    indicatorsElem.insertAdjacentHTML('beforeend', '<span class="material-icons timerIndicator indicatorIcon fiber_manual_record"></span>');
+                    indicatorsElem.insertAdjacentHTML('beforeend', '<span class="material-icons timerIndicator indicatorIcon fiber_manual_record" aria-hidden="true"></span>');
                 }
                 cell.setAttribute('data-timerid', newTimerId);
             }
diff --git a/src/components/cardbuilder/chaptercardbuilder.js b/src/components/cardbuilder/chaptercardbuilder.js
index e364056e14..9f48017936 100644
--- a/src/components/cardbuilder/chaptercardbuilder.js
+++ b/src/components/cardbuilder/chaptercardbuilder.js
@@ -94,7 +94,7 @@ import ServerConnections from '../ServerConnections';
         let cardImageContainer = imgUrl ? (`<div class="${cardImageContainerClass} lazy" data-src="${imgUrl}">`) : (`<div class="${cardImageContainerClass}">`);
 
         if (!imgUrl) {
-            cardImageContainer += '<span class="material-icons cardImageIcon local_movies"></span>';
+            cardImageContainer += '<span class="material-icons cardImageIcon local_movies" aria-hidden="true"></span>';
         }
 
         let nameHtml = '';
diff --git a/src/components/channelMapper/channelMapper.js b/src/components/channelMapper/channelMapper.js
index 3f9ed65a02..8f277fa943 100644
--- a/src/components/channelMapper/channelMapper.js
+++ b/src/components/channelMapper/channelMapper.js
@@ -72,7 +72,7 @@ export default class channelMapper {
         function getTunerChannelHtml(channel, providerName) {
             let html = '';
             html += '<div class="listItem">';
-            html += '<span class="material-icons listItemIcon dvr"></span>';
+            html += '<span class="material-icons listItemIcon dvr" aria-hidden="true"></span>';
             html += '<div class="listItemBody two-line">';
             html += '<h3 class="listItemBodyText">';
             html += channel.Name;
@@ -85,7 +85,7 @@ export default class channelMapper {
 
             html += '</div>';
             html += '</div>';
-            html += `<button class="btnMap autoSize" is="paper-icon-button-light" type="button" data-id="${channel.Id}" data-providerid="${channel.ProviderChannelId}"><span class="material-icons mode_edit"></span></button>`;
+            html += `<button class="btnMap autoSize" is="paper-icon-button-light" type="button" data-id="${channel.Id}" data-providerid="${channel.ProviderChannelId}"><span class="material-icons mode_edit" aria-hidden="true"></span></button>`;
             return html += '</div>';
         }
 
@@ -127,7 +127,7 @@ export default class channelMapper {
             let html = '';
             const title = globalize.translate('MapChannels');
             html += '<div class="formDialogHeader">';
-            html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
+            html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>';
             html += '<h3 class="formDialogHeaderTitle">';
             html += title;
             html += '</h3>';
diff --git a/src/components/collectionEditor/collectionEditor.js b/src/components/collectionEditor/collectionEditor.js
index a5fc26c446..e83467288d 100644
--- a/src/components/collectionEditor/collectionEditor.js
+++ b/src/components/collectionEditor/collectionEditor.js
@@ -229,7 +229,7 @@ import toast from '../toast/toast';
             const 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"><span class="material-icons arrow_back"></span></button>';
+            html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>';
             html += '<h3 class="formDialogHeaderTitle">';
             html += title;
             html += '</h3>';
diff --git a/src/components/dashboard/users/AccessScheduleList.tsx b/src/components/dashboard/users/AccessScheduleList.tsx
index b46c6beeb0..0a2aceaa55 100644
--- a/src/components/dashboard/users/AccessScheduleList.tsx
+++ b/src/components/dashboard/users/AccessScheduleList.tsx
@@ -9,7 +9,7 @@ const createButtonElement = ({index}) => ({
         class='btnDelete listItemButton'
         data-index='${index}'
     >
-        <span class='material-icons delete' />
+        <span class='material-icons delete' aria-hidden='true' />
     </button>`
 });
 
diff --git a/src/components/dashboard/users/BlockedTagList.tsx b/src/components/dashboard/users/BlockedTagList.tsx
index b5cf44d0a8..e2d73fa90a 100644
--- a/src/components/dashboard/users/BlockedTagList.tsx
+++ b/src/components/dashboard/users/BlockedTagList.tsx
@@ -7,7 +7,7 @@ const createButtonElement = ({tag}) => ({
         class='blockedTag btnDeleteTag listItemButton'
         data-tag='${tag}'
     >
-        <span class='material-icons delete' />
+        <span class='material-icons delete' aria-hidden='true' />
     </button>`
 });
 
diff --git a/src/components/dashboard/users/SectionTitleButtonElement.tsx b/src/components/dashboard/users/SectionTitleButtonElement.tsx
index 2147e228b9..0ac885d625 100644
--- a/src/components/dashboard/users/SectionTitleButtonElement.tsx
+++ b/src/components/dashboard/users/SectionTitleButtonElement.tsx
@@ -15,7 +15,7 @@ const createButtonElement = ({ className, title, icon }) => ({
         style="margin-left:1em;"
         title="${title}"
     >
-        <span class="material-icons ${icon}"></span>
+        <span class="material-icons ${icon}" aria-hidden="true"></span>
     </button>`
 });
 
diff --git a/src/components/dashboard/users/UserCardBox.tsx b/src/components/dashboard/users/UserCardBox.tsx
index 7342b6a324..c8213ebbd7 100644
--- a/src/components/dashboard/users/UserCardBox.tsx
+++ b/src/components/dashboard/users/UserCardBox.tsx
@@ -20,7 +20,7 @@ const createButtonElement = () => ({
         type="button"
         class="btnUserMenu flex-shrink-zero"
         >
-        <span class="material-icons more_vert"></span>
+        <span class="material-icons more_vert" aria-hidden="true"></span>
     </button>`
 });
 
@@ -64,7 +64,7 @@ const UserCardBox: FunctionComponent<IProps> = ({ user = [] }: IProps) => {
     const renderImgUrl = imgUrl ?
         `<div class='${imageClass}' style='background-image:url(${imgUrl})'></div>` :
         `<div class='${imageClass} ${cardBuilder.getDefaultBackgroundClass(user.Name)} flex align-items-center justify-content-center'>
-            <span class='material-icons cardImageIcon person'></span>
+            <span class='material-icons cardImageIcon person' aria-hidden='true'></span>
         </div>`;
 
     return (
diff --git a/src/components/directorybrowser/directorybrowser.js b/src/components/directorybrowser/directorybrowser.js
index 2577c9fc92..5f5acc5c21 100644
--- a/src/components/directorybrowser/directorybrowser.js
+++ b/src/components/directorybrowser/directorybrowser.js
@@ -77,7 +77,7 @@ function getItem(cssClass, type, path, name) {
     html += name;
     html += '</div>';
     html += '</div>';
-    html += '<span class="material-icons arrow_forward" style="font-size:inherit;"></span>';
+    html += '<span class="material-icons arrow_forward" aria-hidden="true" style="font-size:inherit;"></span>';
     html += '</div>';
     return html;
 }
@@ -116,7 +116,7 @@ function getEditorHtml(options, systemInfo) {
     html += `<input is="emby-input" id="txtDirectoryPickerPath" type="text" required="required" ${readOnlyAttribute} label="${globalize.translate(labelKey)}"/>`;
     html += '</div>';
     if (!readOnlyAttribute) {
-        html += `<button type="button" is="paper-icon-button-light" class="btnRefreshDirectories emby-input-iconbutton" title="${globalize.translate('Refresh')}"><span class="material-icons search"></span></button>`;
+        html += `<button type="button" is="paper-icon-button-light" class="btnRefreshDirectories emby-input-iconbutton" title="${globalize.translate('Refresh')}"><span class="material-icons search" aria-hidden="true"></span></button>`;
     }
     html += '</div>';
     if (!readOnlyAttribute) {
@@ -264,7 +264,7 @@ class DirectoryBrowser {
 
                 let html = '';
                 html += '<div class="formDialogHeader">';
-                html += '<button is="paper-icon-button-light" class="btnCloseDialog autoSize" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
+                html += '<button is="paper-icon-button-light" class="btnCloseDialog autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>';
                 html += '<h3 class="formDialogHeaderTitle">';
                 html += options.header || globalize.translate('HeaderSelectPath');
                 html += '</h3>';
diff --git a/src/components/favoriteitems.js b/src/components/favoriteitems.js
index 372060d97c..4230217429 100644
--- a/src/components/favoriteitems.js
+++ b/src/components/favoriteitems.js
@@ -145,7 +145,7 @@ import '../elements/emby-itemscontainer/emby-itemscontainer';
                     html += '<h2 class="sectionTitle sectionTitle-cards">';
                     html += globalize.translate(section.name);
                     html += '</h2>';
-                    html += '<span class="material-icons chevron_right"></span>';
+                    html += '<span class="material-icons chevron_right" aria-hidden="true"></span>';
                     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 b36145f193..7436f04d11 100644
--- a/src/components/filtermenu/filtermenu.js
+++ b/src/components/filtermenu/filtermenu.js
@@ -228,7 +228,7 @@ class FilterMenu {
             let html = '';
 
             html += '<div class="formDialogHeader">';
-            html += '<button is="paper-icon-button-light" class="btnCancel hide-mouse-idle-tv" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
+            html += '<button is="paper-icon-button-light" class="btnCancel hide-mouse-idle-tv" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>';
             html += '<h3 class="formDialogHeaderTitle">${Filters}</h3>';
 
             html += '</div>';
diff --git a/src/components/guide/guide.js b/src/components/guide/guide.js
index 2d39183bde..0fbb39d2c8 100644
--- a/src/components/guide/guide.js
+++ b/src/components/guide/guide.js
@@ -409,7 +409,7 @@ function Guide(options) {
         let status;
 
         if (item.Type === 'SeriesTimer') {
-            return '<span class="material-icons programIcon seriesTimerIcon fiber_smart_record"></span>';
+            return '<span class="material-icons programIcon seriesTimerIcon fiber_smart_record" aria-hidden="true"></span>';
         } else if (item.TimerId || item.SeriesTimerId) {
             status = item.Status || 'Cancelled';
         } else if (item.Type === 'Timer') {
@@ -420,13 +420,13 @@ function Guide(options) {
 
         if (item.SeriesTimerId) {
             if (status !== 'Cancelled') {
-                return '<span class="material-icons programIcon seriesTimerIcon fiber_smart_record"></span>';
+                return '<span class="material-icons programIcon seriesTimerIcon fiber_smart_record" aria-hidden="true"></span>';
             }
 
-            return '<span class="material-icons programIcon seriesTimerIcon seriesTimerIcon-inactive fiber_smart_record"></span>';
+            return '<span class="material-icons programIcon seriesTimerIcon seriesTimerIcon-inactive fiber_smart_record" aria-hidden="true"></span>';
         }
 
-        return '<span class="material-icons programIcon timerIcon fiber_manual_record"></span>';
+        return '<span class="material-icons programIcon timerIcon fiber_manual_record" aria-hidden="true"></span>';
     }
 
     function getChannelProgramsHtml(context, date, channel, programs, options, listInfo) {
@@ -537,7 +537,7 @@ function Guide(options) {
 
                 html += '<div class="' + guideProgramNameClass + '">';
 
-                html += '<div class="guide-programNameCaret hide"><span class="guideProgramNameCaretIcon material-icons keyboard_arrow_left"></span></div>';
+                html += '<div class="guide-programNameCaret hide"><span class="guideProgramNameCaretIcon material-icons keyboard_arrow_left" aria-hidden="true"></span></div>';
 
                 html += '<div class="guideProgramNameText">' + program.Name;
 
diff --git a/src/components/homeScreenSettings/homeScreenSettings.js b/src/components/homeScreenSettings/homeScreenSettings.js
index ebceee1c5c..7561a40791 100644
--- a/src/components/homeScreenSettings/homeScreenSettings.js
+++ b/src/components/homeScreenSettings/homeScreenSettings.js
@@ -177,7 +177,7 @@ import template from './homeScreenSettings.template.html';
 
             currentHtml += `<div class="listItem viewItem" data-viewid="${view.Id}">`;
 
-            currentHtml += '<span class="material-icons listItemIcon folder_open"></span>';
+            currentHtml += '<span class="material-icons listItemIcon folder_open" aria-hidden="true"></span>';
 
             currentHtml += '<div class="listItemBody">';
 
@@ -187,8 +187,8 @@ import template from './homeScreenSettings.template.html';
 
             currentHtml += '</div>';
 
-            currentHtml += `<button type="button" is="paper-icon-button-light" class="btnViewItemUp btnViewItemMove autoSize" title="${globalize.translate('Up')}"><span class="material-icons keyboard_arrow_up"></span></button>`;
-            currentHtml += `<button type="button" is="paper-icon-button-light" class="btnViewItemDown btnViewItemMove autoSize" title="${globalize.translate('Down')}"><span class="material-icons keyboard_arrow_down"></span></button>`;
+            currentHtml += `<button type="button" is="paper-icon-button-light" class="btnViewItemUp btnViewItemMove autoSize" title="${globalize.translate('Up')}"><span class="material-icons keyboard_arrow_up" aria-hidden="true"></span></button>`;
+            currentHtml += `<button type="button" is="paper-icon-button-light" class="btnViewItemDown btnViewItemMove autoSize" title="${globalize.translate('Down')}"><span class="material-icons keyboard_arrow_down" aria-hidden="true"></span></button>`;
 
             currentHtml += '</div>';
 
diff --git a/src/components/homesections/homesections.js b/src/components/homesections/homesections.js
index ff5c2dbed2..5926fb5b4b 100644
--- a/src/components/homesections/homesections.js
+++ b/src/components/homesections/homesections.js
@@ -194,7 +194,7 @@ import ServerConnections from '../ServerConnections';
         for (let i = 0, length = items.length; i < length; i++) {
             const item = items[i];
             const icon = imageHelper.getLibraryIcon(item.CollectionType);
-            html += '<a is="emby-linkbutton" href="' + appRouter.getRouteUrl(item) + '" class="raised homeLibraryButton"><span class="material-icons homeLibraryIcon ' + icon + '"></span><span class="homeLibraryText">' + item.Name + '</span></a>';
+            html += '<a is="emby-linkbutton" href="' + appRouter.getRouteUrl(item) + '" class="raised homeLibraryButton"><span class="material-icons homeLibraryIcon ' + icon + '" aria-hidden="true"></span><span class="homeLibraryText">' + item.Name + '</span></a>';
         }
 
         html += '</div>';
@@ -285,7 +285,7 @@ import ServerConnections from '../ServerConnections';
             html += '<h2 class="sectionTitle sectionTitle-cards">';
             html += globalize.translate('LatestFromLibrary', parent.Name);
             html += '</h2>';
-            html += '<span class="material-icons chevron_right"></span>';
+            html += '<span class="material-icons chevron_right" aria-hidden="true"></span>';
             html += '</a>';
         } else {
             html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate('LatestFromLibrary', parent.Name) + '</h2>';
@@ -567,7 +567,7 @@ import ServerConnections from '../ServerConnections';
                     html += '<h2 class="sectionTitle sectionTitle-cards">';
                     html += globalize.translate('HeaderOnNow');
                     html += '</h2>';
-                    html += '<span class="material-icons chevron_right"></span>';
+                    html += '<span class="material-icons chevron_right" aria-hidden="true"></span>';
                     html += '</a>';
                 } else {
                     html += '<h2 class="sectionTitle sectionTitle-cards">' + globalize.translate('HeaderOnNow') + '</h2>';
@@ -654,7 +654,7 @@ import ServerConnections from '../ServerConnections';
                 html += globalize.translate('NextUp');
             }
             html += '</h2>';
-            html += '<span class="material-icons chevron_right"></span>';
+            html += '<span class="material-icons chevron_right" aria-hidden="true"></span>';
             html += '</a>';
         } else {
             html += '<h2 class="sectionTitle sectionTitle-cards">';
diff --git a/src/components/imageDownloader/imageDownloader.js b/src/components/imageDownloader/imageDownloader.js
index 01ff77013a..5f3eb50ced 100644
--- a/src/components/imageDownloader/imageDownloader.js
+++ b/src/components/imageDownloader/imageDownloader.js
@@ -129,8 +129,8 @@ import template from './imageDownloader.template.html';
         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') + '><span class="material-icons arrow_back"></span></button>';
-            html += '<button is="paper-icon-button-light" title="' + globalize.translate('Next') + '" class="btnNextPage autoSize" ' + (startIndex + limit >= totalRecordCount ? 'disabled' : '') + '><span class="material-icons arrow_forward"></span></button>';
+            html += `<button is="paper-icon-button-light" title="${globalize.translate('Previous')}" class="btnPreviousPage autoSize" ${(startIndex ? '' : 'disabled')}><span class="material-icons arrow_back" aria-hidden="true"></span></button>`;
+            html += `<button is="paper-icon-button-light" title="${globalize.translate('Next')}" class="btnNextPage autoSize" ${(startIndex + limit >= totalRecordCount ? 'disabled' : '')}><span class="material-icons arrow_forward" aria-hidden="true"></span></button>`;
             html += '</div>';
         }
 
@@ -264,7 +264,7 @@ import template from './imageDownloader.template.html';
         if (enableFooterButtons) {
             html += '<div class="cardText cardTextCentered">';
 
-            html += '<button is="paper-icon-button-light" class="btnDownloadRemoteImage autoSize" raised" title="' + globalize.translate('Download') + '"><span class="material-icons cloud_download"></span></button>';
+            html += `<button is="paper-icon-button-light" class="btnDownloadRemoteImage autoSize" raised" title="${globalize.translate('Download')}"><span class="material-icons cloud_download" aria-hidden="true"></span></button>`;
             html += '</div>';
         }
 
diff --git a/src/components/imageDownloader/imageDownloader.template.html b/src/components/imageDownloader/imageDownloader.template.html
index aede7a6933..6818b31530 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"><span class="material-icons arrow_back"></span></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>
     <h3 class="formDialogHeaderTitle">
         ${Search}
     </h3>
diff --git a/src/components/imageOptionsEditor/imageOptionsEditor.template.html b/src/components/imageOptionsEditor/imageOptionsEditor.template.html
index 28275cdc95..e2d4df73c6 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"><span class="material-icons arrow_back"></span></button>
+    <button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>
     <h3 class="formDialogHeaderTitle">
         ${HeaderImageOptions}
     </h3>
diff --git a/src/components/imageUploader/imageUploader.template.html b/src/components/imageUploader/imageUploader.template.html
index 6a9e21ff15..a59123e34d 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"><span class="material-icons arrow_back"></span></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></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;">
-                    <span class="material-icons folder"></span>
+                    <span class="material-icons folder" aria-hidden="true"></span>
                     <span>${Browse}</span>
                 </button>
             </div>
diff --git a/src/components/imageeditor/imageeditor.js b/src/components/imageeditor/imageeditor.js
index 5682f3e95b..3a7fad5ed3 100644
--- a/src/components/imageeditor/imageeditor.js
+++ b/src/components/imageeditor/imageeditor.js
@@ -165,21 +165,21 @@ import template from './imageeditor.template.html';
                 if (index > 0) {
                     html += '<button type="button" is="paper-icon-button-light" class="btnMoveImage autoSize" data-imagetype="' + image.ImageType + '" data-index="' + image.ImageIndex + '" data-newindex="' + (image.ImageIndex - 1) + '" title="' + globalize.translate('MoveLeft') + '"><span class="material-icons chevron_left"></span></button>';
                 } else {
-                    html += '<button type="button" is="paper-icon-button-light" class="autoSize" disabled title="' + globalize.translate('MoveLeft') + '"><span class="material-icons chevron_left"></span></button>';
+                    html += '<button type="button" is="paper-icon-button-light" class="autoSize" disabled title="' + globalize.translate('MoveLeft') + '"><span class="material-icons chevron_left" aria-hidden="true"></span></button>';
                 }
 
                 if (index < numImages - 1) {
-                    html += '<button type="button" is="paper-icon-button-light" class="btnMoveImage autoSize" data-imagetype="' + image.ImageType + '" data-index="' + image.ImageIndex + '" data-newindex="' + (image.ImageIndex + 1) + '" title="' + globalize.translate('MoveRight') + '"><span class="material-icons chevron_right"></span></button>';
+                    html += '<button type="button" is="paper-icon-button-light" class="btnMoveImage autoSize" data-imagetype="' + image.ImageType + '" data-index="' + image.ImageIndex + '" data-newindex="' + (image.ImageIndex + 1) + '" title="' + globalize.translate('MoveRight') + '"><span class="material-icons chevron_right" aria-hidden="true"></span></button>';
                 } else {
-                    html += '<button type="button" is="paper-icon-button-light" class="autoSize" disabled title="' + globalize.translate('MoveRight') + '"><span class="material-icons chevron_right"></span></button>';
+                    html += '<button type="button" is="paper-icon-button-light" class="autoSize" disabled title="' + globalize.translate('MoveRight') + '"><span class="material-icons chevron_right" aria-hidden="true"></span></button>';
                 }
             } else {
                 if (imageProviders.length) {
-                    html += '<button type="button" is="paper-icon-button-light" data-imagetype="' + image.ImageType + '" class="btnSearchImages autoSize" title="' + globalize.translate('Search') + '"><span class="material-icons search"></span></button>';
+                    html += '<button type="button" is="paper-icon-button-light" data-imagetype="' + image.ImageType + '" class="btnSearchImages autoSize" title="' + globalize.translate('Search') + '"><span class="material-icons search" aria-hidden="true"></span></button>';
                 }
             }
 
-            html += '<button type="button" is="paper-icon-button-light" data-imagetype="' + image.ImageType + '" data-index="' + (image.ImageIndex != null ? image.ImageIndex : 'null') + '" class="btnDeleteImage autoSize" title="' + globalize.translate('Delete') + '"><span class="material-icons delete"></span></button>';
+            html += '<button type="button" is="paper-icon-button-light" data-imagetype="' + image.ImageType + '" data-index="' + (image.ImageIndex != null ? image.ImageIndex : 'null') + '" class="btnDeleteImage autoSize" title="' + globalize.translate('Delete') + '"><span class="material-icons delete" aria-hidden="true"></span></button>';
             html += '</div>';
         }
 
diff --git a/src/components/imageeditor/imageeditor.template.html b/src/components/imageeditor/imageeditor.template.html
index ce24e724bd..4d7b096f00 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"><span class="material-icons arrow_back"></span></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></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;">
-                    <span class="material-icons search"></span>
+                    <span class="material-icons search" aria-hidden="true"></span>
                 </button>
                 <button type="button" is="emby-button" class="btnOpenUploadMenu fab mini hide" style="margin-left: .5em;">
-                    <span class="material-icons add"></span>
+                    <span class="material-icons add" aria-hidden="true"></span>
                 </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">
-                    <span class="material-icons search"></span>
+                    <span class="material-icons search" aria-hidden="true"></span>
                 </button>
                 <button type="button" is="emby-button" class="btnOpenUploadMenu fab mini hide" style="margin-left: .5em;" data-imagetype="Backdrop">
-                    <span class="material-icons add"></span>
+                    <span class="material-icons add" aria-hidden="true"></span>
                 </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">
-                    <span class="material-icons search"></span>
+                    <span class="material-icons search" aria-hidden="true"></span>
                 </button>
                 <button type="button" is="emby-button" class="btnOpenUploadMenu fab mini hide" style="margin-left: .5em;" data-imagetype="Screenshot">
-                    <span class="material-icons add"></span>
+                    <span class="material-icons add" aria-hidden="true"></span>
                 </button>
             </div>
             <div id="screenshots" class="itemsContainer vertical-wrap">
diff --git a/src/components/indicators/indicators.js b/src/components/indicators/indicators.js
index aab2f64073..6fc483c3fd 100644
--- a/src/components/indicators/indicators.js
+++ b/src/components/indicators/indicators.js
@@ -88,7 +88,7 @@ export function getPlayedIndicatorHtml(item) {
         }
 
         if (userData.PlayedPercentage && userData.PlayedPercentage >= 100 || (userData.Played)) {
-            return '<div class="playedIndicator indicator"><span class="material-icons indicatorIcon check"></span></div>';
+            return '<div class="playedIndicator indicator"><span class="material-icons indicatorIcon check" aria-hidden="true"></span></div>';
         }
     }
 
@@ -109,7 +109,7 @@ export function getTimerIndicator(item) {
     let status;
 
     if (item.Type === 'SeriesTimer') {
-        return '<span class="material-icons timerIndicator indicatorIcon fiber_smart_record"></span>';
+        return '<span class="material-icons timerIndicator indicatorIcon fiber_smart_record" aria-hidden="true"></span>';
     } else if (item.TimerId || item.SeriesTimerId) {
         status = item.Status || 'Cancelled';
     } else if (item.Type === 'Timer') {
@@ -120,20 +120,20 @@ export function getTimerIndicator(item) {
 
     if (item.SeriesTimerId) {
         if (status !== 'Cancelled') {
-            return '<span class="material-icons timerIndicator indicatorIcon fiber_smart_record"></span>';
+            return '<span class="material-icons timerIndicator indicatorIcon fiber_smart_record" aria-hidden="true"></span>';
         }
 
-        return '<span class="material-icons timerIndicator timerIndicator-inactive indicatorIcon fiber_smart_record"></span>';
+        return '<span class="material-icons timerIndicator timerIndicator-inactive indicatorIcon fiber_smart_record" aria-hidden="true"></span>';
     }
 
-    return '<span class="material-icons timerIndicator indicatorIcon fiber_manual_record"></span>';
+    return '<span class="material-icons timerIndicator indicatorIcon fiber_manual_record" aria-hidden="true"></span>';
 }
 
 export function getSyncIndicator(item) {
     if (item.SyncPercent === 100) {
-        return '<div class="syncIndicator indicator fullSyncIndicator"><span class="material-icons indicatorIcon file_download"></span></div>';
+        return '<div class="syncIndicator indicator fullSyncIndicator"><span class="material-icons indicatorIcon file_download" aria-hidden="true"></span></div>';
     } else if (item.SyncPercent != null) {
-        return '<div class="syncIndicator indicator emptySyncIndicator"><span class="material-icons indicatorIcon file_download"></span></div>';
+        return '<div class="syncIndicator indicator emptySyncIndicator"><span class="material-icons indicatorIcon file_download" aria-hidden="true"></span></div>';
     }
 
     return '';
@@ -148,7 +148,7 @@ export function getTypeIndicator(item) {
     };
 
     const icon = iconT[item.Type];
-    return icon ? '<div class="indicator videoIndicator"><span class="material-icons indicatorIcon ' + icon + '"></span></div>' : '';
+    return icon ? '<div class="indicator videoIndicator"><span class="material-icons indicatorIcon ' + icon + '" aria-hidden="true"></span></div>' : '';
 }
 
 export function getMissingIndicator(item) {
diff --git a/src/components/itemMediaInfo/itemMediaInfo.template.html b/src/components/itemMediaInfo/itemMediaInfo.template.html
index c2ec8942ef..ca34f5d0a4 100644
--- a/src/components/itemMediaInfo/itemMediaInfo.template.html
+++ b/src/components/itemMediaInfo/itemMediaInfo.template.html
@@ -1,6 +1,6 @@
 <div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
-        <span class="material-icons arrow_back"></span>
+        <span class="material-icons arrow_back" aria-hidden="true"></span>
     </button>
     <h3 class="formDialogHeaderTitle">${MoreMediaInfo}</h3>
 </div>
diff --git a/src/components/itemidentifier/itemidentifier.template.html b/src/components/itemidentifier/itemidentifier.template.html
index 9ea0e945db..96d3dd6431 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">
-        <span class="material-icons arrow_back"></span>
+        <span class="material-icons arrow_back" aria-hidden="true"></span>
     </button>
     <h3 class="formDialogHeaderTitle">${Identify}</h3>
 </div>
diff --git a/src/components/libraryoptionseditor/libraryoptionseditor.js b/src/components/libraryoptionseditor/libraryoptionseditor.js
index b8950ebed0..f57e6e1b65 100644
--- a/src/components/libraryoptionseditor/libraryoptionseditor.js
+++ b/src/components/libraryoptionseditor/libraryoptionseditor.js
@@ -69,16 +69,16 @@ import template from './libraryoptionseditor.template.html';
         for (let i = 0; i < plugins.length; i++) {
             const plugin = plugins[i];
             html += `<div class="listItem localReaderOption sortableOption" data-pluginname="${plugin.Name}">`;
-            html += '<span class="listItemIcon material-icons live_tv"></span>';
+            html += '<span class="listItemIcon material-icons live_tv" aria-hidden="true"></span>';
             html += '<div class="listItemBody">';
             html += '<h3 class="listItemBodyText">';
             html += plugin.Name;
             html += '</h3>';
             html += '</div>';
             if (i > 0) {
-                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Up')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up"></span></button>`;
+                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Up')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up" aria-hidden="true"></span></button>`;
             } else if (plugins.length > 1) {
-                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Down')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down"></span></button>`;
+                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Down')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down" aria-hidden="true"></span></button>`;
             }
             html += '</div>';
         }
@@ -132,9 +132,9 @@ import template from './libraryoptionseditor.template.html';
             html += '</h3>';
             html += '</div>';
             if (index > 0) {
-                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Up') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_up"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Up') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_up" aria-hidden="true"></span></button>';
             } else if (plugins.length > 1) {
-                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Down') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_down"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Down') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + index + '"><span class="material-icons keyboard_arrow_down" aria-hidden="true"></span></button>';
             }
             html += '</div>';
         });
@@ -198,9 +198,9 @@ import template from './libraryoptionseditor.template.html';
             html += '</h3>';
             html += '</div>';
             if (i > 0) {
-                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Up')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up"></span></button>`;
+                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Up')}" class="btnSortableMoveUp btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_up" aria-hidden="true"></span></button>`;
             } else if (plugins.length > 1) {
-                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Down')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down"></span></button>`;
+                html += `<button type="button" is="paper-icon-button-light" title="${globalize.translate('Down')}" class="btnSortableMoveDown btnSortable" data-pluginindex="${i}"><span class="material-icons keyboard_arrow_down" aria-hidden="true"></span></button>`;
             }
             html += '</div>';
         }
@@ -237,9 +237,9 @@ import template from './libraryoptionseditor.template.html';
             html += '</h3>';
             html += '</div>';
             if (i > 0) {
-                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Up') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_up"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Up') + '" class="btnSortableMoveUp btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_up" aria-hidden="true"></span></button>';
             } else if (plugins.length > 1) {
-                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Down') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_down"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('Down') + '" class="btnSortableMoveDown btnSortable" data-pluginindex="' + i + '"><span class="material-icons keyboard_arrow_down" aria-hidden="true"></span></button>';
             }
             html += '</div>';
         }
diff --git a/src/components/listview/listview.js b/src/components/listview/listview.js
index 037d75de90..e6a6767e8a 100644
--- a/src/components/listview/listview.js
+++ b/src/components/listview/listview.js
@@ -166,7 +166,7 @@ import ServerConnections from '../ServerConnections';
         for (let i = 0, length = options.rightButtons.length; i < length; i++) {
             const button = options.rightButtons[i];
 
-            html += `<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="custom" data-customaction="${button.id}" title="${button.title}"><span class="material-icons ${button.icon}"></span></button>`;
+            html += `<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="custom" data-customaction="${button.id}" title="${button.title}"><span class="material-icons ${button.icon}" aria-hidden="true"></span></button>`;
         }
 
         return html;
@@ -257,7 +257,7 @@ import ServerConnections from '../ServerConnections';
             }
 
             if (!clickEntireItem && options.dragHandle) {
-                html += '<span class="listViewDragHandle material-icons listItemIcon listItemIcon-transparent drag_handle"></span>';
+                html += '<span class="listViewDragHandle material-icons listItemIcon listItemIcon-transparent drag_handle" aria-hidden="true"></span>';
             }
 
             if (options.image !== false) {
@@ -295,7 +295,7 @@ import ServerConnections from '../ServerConnections';
                 }
 
                 if (playOnImageClick) {
-                    html += '<button is="paper-icon-button-light" class="listItemImageButton itemAction" data-action="resume"><span class="material-icons listItemImageButton-icon play_arrow"></span></button>';
+                    html += '<button is="paper-icon-button-light" class="listItemImageButton itemAction" data-action="resume"><span class="material-icons listItemImageButton-icon play_arrow" aria-hidden="true"></span></button>';
                 }
 
                 const progressHtml = indicators.getProgressBarHtml(item, {
@@ -455,11 +455,11 @@ import ServerConnections from '../ServerConnections';
 
             if (!clickEntireItem) {
                 if (options.addToListButton) {
-                    html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="addtoplaylist"><span class="material-icons playlist_add"></span></button>';
+                    html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="addtoplaylist"><span class="material-icons playlist_add" aria-hidden="true"></span></button>';
                 }
 
                 if (options.infoButton) {
-                    html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="link"><span class="material-icons info_outline"></span></button>';
+                    html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="link"><span class="material-icons info_outline" aria-hidden="true"></span></button>';
                 }
 
                 if (options.rightButtons) {
@@ -471,16 +471,16 @@ import ServerConnections from '../ServerConnections';
                     const likes = userData.Likes == null ? '' : userData.Likes;
 
                     if (itemHelper.canMarkPlayed(item) && options.enablePlayedButton !== false) {
-                        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) + '"><span class="material-icons check"></span></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) + '"><span class="material-icons check" aria-hidden="true"></span></button>';
                     }
 
                     if (itemHelper.canRate(item) && options.enableRatingButton !== false) {
-                        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) + '"><span class="material-icons favorite"></span></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) + '"><span class="material-icons favorite" aria-hidden="true"></span></button>';
                     }
                 }
 
                 if (options.moreButton !== false) {
-                    html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="menu"><span class="material-icons more_vert"></span></button>';
+                    html += '<button is="paper-icon-button-light" class="listItemButton itemAction" data-action="menu"><span class="material-icons more_vert" aria-hidden="true"></span></button>';
                 }
             }
             html += '</div>';
diff --git a/src/components/mediaLibraryCreator/mediaLibraryCreator.js b/src/components/mediaLibraryCreator/mediaLibraryCreator.js
index 86369b853e..889804bc9d 100644
--- a/src/components/mediaLibraryCreator/mediaLibraryCreator.js
+++ b/src/components/mediaLibraryCreator/mediaLibraryCreator.js
@@ -127,7 +127,7 @@ import template from './mediaLibraryCreator.template.html';
         }
 
         html += '</div>';
-        html += `<button type="button" is="paper-icon-button-light"" class="listItemButton btnRemovePath" data-index="${index}"><span class="material-icons remove_circle"></span></button>`;
+        html += `<button type="button" is="paper-icon-button-light"" class="listItemButton btnRemovePath" data-index="${index}"><span class="material-icons remove_circle" aria-hidden="true"></span></button>`;
         html += '</div>';
         return html;
     }
diff --git a/src/components/mediaLibraryCreator/mediaLibraryCreator.template.html b/src/components/mediaLibraryCreator/mediaLibraryCreator.template.html
index c5571b54d2..27567590c9 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"><span class="material-icons arrow_back"></span></button>
+    <button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>
     <h3 class="formDialogHeaderTitle">${ButtonAddMediaLibrary}</h3>
 </div>
 
@@ -20,7 +20,7 @@
             <div style="display: flex; align-items: center;">
                 <h1 style="margin: .5em 0;">${Folders}</h1>
                 <button is="emby-button" type="button" class="fab btnAddFolder submit" style="margin-left:1em;" title="${Add}">
-                    <span class="material-icons add"></span>
+                    <span class="material-icons add" aria-hidden="true"></span>
                 </button>
             </div>
             <div class="paperList folderList hide" style="margin-bottom:2em;"></div>
diff --git a/src/components/mediaLibraryEditor/mediaLibraryEditor.js b/src/components/mediaLibraryEditor/mediaLibraryEditor.js
index dcb418f806..aaf0c1e550 100644
--- a/src/components/mediaLibraryEditor/mediaLibraryEditor.js
+++ b/src/components/mediaLibraryEditor/mediaLibraryEditor.js
@@ -119,7 +119,7 @@ import template from './mediaLibraryEditor.template.html';
         }
 
         html += '</div>';
-        html += `<button type="button" is="paper-icon-button-light" class="listItemButton btnRemovePath" data-index="${index}"><span class="material-icons remove_circle"></span></button>`;
+        html += `<button type="button" is="paper-icon-button-light" class="listItemButton btnRemovePath" data-index="${index}"><span class="material-icons remove_circle" aria-hidden="true"></span></button>`;
         html += '</div>';
         return html;
     }
diff --git a/src/components/mediaLibraryEditor/mediaLibraryEditor.template.html b/src/components/mediaLibraryEditor/mediaLibraryEditor.template.html
index 732851d4af..22267e1c9c 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"><span class="material-icons arrow_back"></span></button>
+    <button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>
     <h3 class="formDialogHeaderTitle"></h3>
 </div>
 
@@ -13,7 +13,7 @@
             <div style="display: flex; align-items: center;">
                 <h1 style="margin: .5em 0;">${Folders}</h1>
                 <button is="emby-button" type="button" class="fab btnAddFolder submit" style="margin-left:1em;" title="${Add}">
-                    <span class="material-icons add"></span>
+                    <span class="material-icons add" aria-hidden="true"></span>
                 </button>
             </div>
             <div class="paperList folderList" style="margin-bottom:2em;"></div>
diff --git a/src/components/mediainfo/mediainfo.js b/src/components/mediainfo/mediainfo.js
index 72255530b2..737d8a4624 100644
--- a/src/components/mediainfo/mediainfo.js
+++ b/src/components/mediainfo/mediainfo.js
@@ -13,7 +13,7 @@ import '../../elements/emby-button/emby-button';
         let status;
 
         if (item.Type === 'SeriesTimer') {
-            return '<span class="material-icons mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon fiber_smart_record"></span>';
+            return '<span class="material-icons mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon fiber_smart_record" aria-hidden="true"></span>';
         } else if (item.TimerId || item.SeriesTimerId) {
             status = item.Status || 'Cancelled';
         } else if (item.Type === 'Timer') {
@@ -24,13 +24,13 @@ import '../../elements/emby-button/emby-button';
 
         if (item.SeriesTimerId) {
             if (status !== 'Cancelled') {
-                return '<span class="material-icons mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon fiber_smart_record"></span>';
+                return '<span class="material-icons mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon fiber_smart_record" aria-hidden="true"></span>';
             }
 
-            return '<span class="material-icons mediaInfoItem mediaInfoIconItem fiber_smart_record"></span>';
+            return '<span class="material-icons mediaInfoItem mediaInfoIconItem fiber_smart_record" aria-hidden="true"></span>';
         }
 
-        return '<span class="material-icons mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon fiber_manual_record"></span>';
+        return '<span class="material-icons mediaInfoItem mediaInfoIconItem mediaInfoTimerIcon fiber_manual_record" aria-hidden="true"></span>';
     }
 
     function getProgramInfoHtml(item, options) {
@@ -358,7 +358,7 @@ import '../../elements/emby-button/emby-button';
         if (item.CommunityRating) {
             html += '<div class="starRatingContainer mediaInfoItem">';
 
-            html += '<span class="material-icons starIcon star"></span>';
+            html += '<span class="material-icons starIcon star" aria-hidden="true"></span>';
             html += item.CommunityRating.toFixed(1);
             html += '</div>';
         }
diff --git a/src/components/metadataEditor/metadataEditor.js b/src/components/metadataEditor/metadataEditor.js
index 10f2ae6cd2..ce2f27faad 100644
--- a/src/components/metadataEditor/metadataEditor.js
+++ b/src/components/metadataEditor/metadataEditor.js
@@ -460,7 +460,7 @@ import template from './metadataEditor.template.html';
             html += '</div>';
 
             if (formatString) {
-                html += '<button type="button" is="paper-icon-button-light" class="btnOpenExternalId align-self-flex-end" data-fieldid="' + id + '"><span class="material-icons open_in_browser"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" class="btnOpenExternalId align-self-flex-end" data-fieldid="' + id + '"><span class="material-icons open_in_browser" aria-hidden="true"></span></button>';
             }
             html += '</div>';
 
@@ -888,7 +888,7 @@ import template from './metadataEditor.template.html';
         for (let i = 0; i < items.length; i++) {
             html += '<div class="listItem">';
 
-            html += '<span class="material-icons listItemIcon live_tv" style="background-color:#333;"></span>';
+            html += '<span class="material-icons listItemIcon live_tv" aria-hidden="true" style="background-color:#333;"></span>';
 
             html += '<div class="listItemBody">';
 
@@ -898,7 +898,7 @@ import template from './metadataEditor.template.html';
 
             html += '</div>';
 
-            html += '<button type="button" is="paper-icon-button-light" data-index="' + i + '" class="btnRemoveFromEditorList autoSize"><span class="material-icons delete"></span></button>';
+            html += '<button type="button" is="paper-icon-button-light" data-index="' + i + '" class="btnRemoveFromEditorList autoSize"><span class="material-icons delete" aria-hidden="true"></span></button>';
 
             html += '</div>';
         }
@@ -935,7 +935,7 @@ import template from './metadataEditor.template.html';
             html += '</button>';
             html += '</div>';
 
-            html += '<button type="button" is="paper-icon-button-light" data-index="' + i + '" class="btnDeletePerson autoSize"><span class="material-icons delete"></span></button>';
+            html += '<button type="button" is="paper-icon-button-light" data-index="' + i + '" class="btnDeletePerson autoSize"><span class="material-icons delete" aria-hidden="true"></span></button>';
 
             html += '</div>';
         }
diff --git a/src/components/metadataEditor/metadataEditor.template.html b/src/components/metadataEditor/metadataEditor.template.html
index 0f9c4516f7..a4a2413a07 100644
--- a/src/components/metadataEditor/metadataEditor.template.html
+++ b/src/components/metadataEditor/metadataEditor.template.html
@@ -1,18 +1,18 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel btnBack autoSize hide" tabindex="-1"><span class="material-icons arrow_back"></span></button>
+    <button is="paper-icon-button-light" class="btnCancel btnBack autoSize hide" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>
     <h3 class="formDialogHeaderTitle">
         ${Edit}
     </h3>
     <div style="margin-left: auto;" class="flex align-items-center justify-content-center">
         <button is="emby-button" type="button" class="btnHeaderSave button-accent-flat button-flat hide" tabindex="-1">
-            <span class="material-icons check"></span>
+            <span class="material-icons check" aria-hidden="true"></span>
             <span>${Save}</span>
         </button>
         <button is="paper-icon-button-light" class="btnMore autoSize" tabindex="-1">
-            <span class="material-icons more_vert"></span>
+            <span class="material-icons more_vert" aria-hidden="true"></span>
         </button>
         <button is="paper-icon-button-light" class="btnCancel btnClose autoSize" tabindex="-1">
-            <span class="material-icons close"></span>
+            <span class="material-icons close" aria-hidden="true"></span>
         </button>
     </div>
 </div>
@@ -195,7 +195,7 @@
                     ${Genres}
                 </h2>
                 <button is="emby-button" type="button" class="fab btnAddTextItem submit" style="margin-left:1em;" title="${Add}">
-                    <span class="material-icons add"></span>
+                    <span class="material-icons add" aria-hidden="true"></span>
                 </button>
                 <div class="paperList" id="listGenres"></div>
             </div>
@@ -204,7 +204,7 @@
                     ${People}
                 </h2>
                 <button is="emby-button" type="button" id="btnAddPerson" class="fab btnAddPerson" style="margin-left:1em;" title="${Add}">
-                    <span class="material-icons add"></span>
+                    <span class="material-icons add" aria-hidden="true"></span>
                 </button>
                 <div id="peopleList" class="paperList">
                 </div>
@@ -214,7 +214,7 @@
                     ${Studios}
                 </h2>
                 <button is="emby-button" type="button" class="fab btnAddTextItem submit" style="margin-left:1em;" title="${Add}">
-                    <span class="material-icons add"></span>
+                    <span class="material-icons add" aria-hidden="true"></span>
                 </button>
                 <div class="paperList" id="listStudios"></div>
             </div>
@@ -223,7 +223,7 @@
                     ${Tags}
                 </h2>
                 <button is="emby-button" type="button" class="fab btnAddTextItem submit" style="margin-left:1em;" title="${Add}">
-                    <span class="material-icons add"></span>
+                    <span class="material-icons add" aria-hidden="true"></span>
                 </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 394473ed27..2e84a00fc8 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"><span class="material-icons arrow_back"></span></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>
     <h3 class="formDialogHeaderTitle">
         ${Edit}
     </h3>
diff --git a/src/components/multiSelect/multiSelect.js b/src/components/multiSelect/multiSelect.js
index e199fa7968..fe82788f6d 100644
--- a/src/components/multiSelect/multiSelect.js
+++ b/src/components/multiSelect/multiSelect.js
@@ -125,11 +125,11 @@ import itemHelper from '../itemHelper';
 
             let html = '';
 
-            html += '<button is="paper-icon-button-light" class="btnCloseSelectionPanel autoSize"><span class="material-icons close"></span></button>';
+            html += '<button is="paper-icon-button-light" class="btnCloseSelectionPanel autoSize"><span class="material-icons close" aria-hidden="true"></span></button>';
             html += '<h1 class="itemSelectionCount"></h1>';
 
             const moreIcon = 'more_vert';
-            html += `<button is="paper-icon-button-light" class="btnSelectionPanelOptions autoSize" style="margin-left:auto;"><span class="material-icons ${moreIcon}"></span></button>`;
+            html += `<button is="paper-icon-button-light" class="btnSelectionPanelOptions autoSize" style="margin-left:auto;"><span class="material-icons ${moreIcon}" aria-hidden="true"></span></button>`;
 
             selectionCommandsPanel.innerHTML = html;
 
diff --git a/src/components/nowPlayingBar/nowPlayingBar.js b/src/components/nowPlayingBar/nowPlayingBar.js
index 3de6b6ec37..4277100168 100644
--- a/src/components/nowPlayingBar/nowPlayingBar.js
+++ b/src/components/nowPlayingBar/nowPlayingBar.js
@@ -59,13 +59,13 @@ import { appRouter } from '../appRouter';
         // The onclicks are needed due to the return false above
         html += '<div class="nowPlayingBarCenter">';
 
-        html += '<button is="paper-icon-button-light" class="previousTrackButton mediaButton"><span class="material-icons skip_previous"></span></button>';
+        html += '<button is="paper-icon-button-light" class="previousTrackButton mediaButton"><span class="material-icons skip_previous" aria-hidden="true"></span></button>';
 
-        html += '<button is="paper-icon-button-light" class="playPauseButton mediaButton"><span class="material-icons pause"></span></button>';
+        html += '<button is="paper-icon-button-light" class="playPauseButton mediaButton"><span class="material-icons pause" aria-hidden="true"></span></button>';
 
-        html += '<button is="paper-icon-button-light" class="stopButton mediaButton"><span class="material-icons stop"></span></button>';
+        html += '<button is="paper-icon-button-light" class="stopButton mediaButton"><span class="material-icons stop" aria-hidden="true"></span></button>';
         if (!layoutManager.mobile) {
-            html += '<button is="paper-icon-button-light" class="nextTrackButton mediaButton"><span class="material-icons skip_next"></span></button>';
+            html += '<button is="paper-icon-button-light" class="nextTrackButton mediaButton"><span class="material-icons skip_next" aria-hidden="true"></span></button>';
         }
 
         html += '<div class="nowPlayingBarCurrentTime"></div>';
@@ -73,23 +73,23 @@ import { appRouter } from '../appRouter';
 
         html += '<div class="nowPlayingBarRight">';
 
-        html += '<button is="paper-icon-button-light" class="muteButton mediaButton"><span class="material-icons volume_up"></span></button>';
+        html += '<button is="paper-icon-button-light" class="muteButton mediaButton"><span class="material-icons volume_up" aria-hidden="true"></span></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"><span class="material-icons repeat"></span></button>';
-        html += '<button is="paper-icon-button-light" class="btnShuffleQueue mediaButton"><span class="material-icons shuffle"></span></button>';
+        html += '<button is="paper-icon-button-light" class="toggleRepeatButton mediaButton"><span class="material-icons repeat" aria-hidden="true"></span></button>';
+        html += '<button is="paper-icon-button-light" class="btnShuffleQueue mediaButton"><span class="material-icons shuffle" aria-hidden="true"></span></button>';
 
         html += '<div class="nowPlayingBarUserDataButtons">';
         html += '</div>';
 
-        html += '<button is="paper-icon-button-light" class="playPauseButton mediaButton"><span class="material-icons pause"></span></button>';
+        html += '<button is="paper-icon-button-light" class="playPauseButton mediaButton"><span class="material-icons pause" aria-hidden="true"></span></button>';
         if (layoutManager.mobile) {
-            html += '<button is="paper-icon-button-light" class="nextTrackButton mediaButton"><span class="material-icons skip_next"></span></button>';
+            html += '<button is="paper-icon-button-light" class="nextTrackButton mediaButton"><span class="material-icons skip_next" aria-hidden="true"></span></button>';
         } else {
-            html += '<button is="paper-icon-button-light" class="btnToggleContextMenu mediaButton"><span class="material-icons more_vert"></span></button>';
+            html += '<button is="paper-icon-button-light" class="btnToggleContextMenu mediaButton"><span class="material-icons more_vert" aria-hidden="true"></span></button>';
         }
 
         html += '</div>';
@@ -569,7 +569,7 @@ import { appRouter } from '../appRouter';
                             });
                         });
                     }
-                    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) + '"><span class="material-icons favorite"></span></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) + '"><span class="material-icons favorite" aria-hidden="true"></span></button>';
                 });
             }
         } else {
diff --git a/src/components/playback/brightnessosd.js b/src/components/playback/brightnessosd.js
index a23fdc0b18..d3678ac3f4 100644
--- a/src/components/playback/brightnessosd.js
+++ b/src/components/playback/brightnessosd.js
@@ -15,7 +15,7 @@ let enableAnimation;
 function getOsdElementHtml() {
     let html = '';
 
-    html += '<span class="material-icons iconOsdIcon brightness_high"></span>';
+    html += '<span class="material-icons iconOsdIcon brightness_high" aria-hidden="true"></span>';
 
     html += '<div class="iconOsdProgressOuter"><div class="iconOsdProgressInner brightnessOsdProgressInner"></div></div>';
 
diff --git a/src/components/playback/volumeosd.js b/src/components/playback/volumeosd.js
index 6412a6e9a5..1c958a4225 100644
--- a/src/components/playback/volumeosd.js
+++ b/src/components/playback/volumeosd.js
@@ -16,7 +16,7 @@ let enableAnimation;
 function getOsdElementHtml() {
     let html = '';
 
-    html += '<span class="material-icons iconOsdIcon volume_up"></span>';
+    html += '<span class="material-icons iconOsdIcon volume_up" aria-hidden="true"></span>';
 
     html += '<div class="iconOsdProgressOuter"><div class="iconOsdProgressInner"></div></div>';
 
diff --git a/src/components/playerstats/playerstats.js b/src/components/playerstats/playerstats.js
index 6e36c38315..acd7d63b25 100644
--- a/src/components/playerstats/playerstats.js
+++ b/src/components/playerstats/playerstats.js
@@ -26,7 +26,7 @@ import ServerConnections from '../ServerConnections';
         if (layoutManager.tv) {
             button = '';
         } else {
-            button = '<button type="button" is="paper-icon-button-light" class="playerStats-closeButton"><span class="material-icons close"></span></button>';
+            button = '<button type="button" is="paper-icon-button-light" class="playerStats-closeButton"><span class="material-icons close" aria-hidden="true"></span></button>';
         }
 
         const contentClass = layoutManager.tv ? 'playerStats-content playerStats-content-tv' : 'playerStats-content';
diff --git a/src/components/playlisteditor/playlisteditor.js b/src/components/playlisteditor/playlisteditor.js
index 02891b1ce1..d579d2fc15 100644
--- a/src/components/playlisteditor/playlisteditor.js
+++ b/src/components/playlisteditor/playlisteditor.js
@@ -242,7 +242,7 @@ import ServerConnections from '../ServerConnections';
             const title = globalize.translate('HeaderAddToPlaylist');
 
             html += '<div class="formDialogHeader">';
-            html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
+            html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>';
             html += '<h3 class="formDialogHeaderTitle">';
             html += title;
             html += '</h3>';
diff --git a/src/components/prompt/prompt.template.html b/src/components/prompt/prompt.template.html
index a07629ae7e..80b76b48aa 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">
-        <span class="material-icons arrow_back"></span>
+        <span class="material-icons arrow_back" aria-hidden="true"></span>
     </button>
 
     <h3 class="formDialogHeaderTitle"></h3>
diff --git a/src/components/recordingcreator/recordingcreator.template.html b/src/components/recordingcreator/recordingcreator.template.html
index 8d7d75c8f6..0708287a98 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"><span class="material-icons arrow_back"></span></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>
     <h3 class="formDialogHeaderTitle"></h3>
 </div>
 <div class="formDialogContent smoothScrollY">
diff --git a/src/components/recordingcreator/recordingeditor.template.html b/src/components/recordingcreator/recordingeditor.template.html
index f7a9f98ee6..c0f3d6991d 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"><span class="material-icons arrow_back"></span></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>
     <h3 class="formDialogHeaderTitle">
         ${HeaderRecordingOptions}
     </h3>
diff --git a/src/components/recordingcreator/recordingfields.template.html b/src/components/recordingcreator/recordingfields.template.html
index 25a0c3c30d..9104907951 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">
-                <span class="material-icons recordingIcon fiber_smart_record"></span>
+                <span class="material-icons recordingIcon fiber_smart_record" aria-hidden="true"></span>
                 <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">
-                <span class="material-icons recordingIcon fiber_manual_record"></span>
+                <span class="material-icons recordingIcon fiber_manual_record" aria-hidden="true"></span>
                 <span class="buttonText">${Record}</span>
             </button>
         </div>
diff --git a/src/components/recordingcreator/seriesrecordingeditor.template.html b/src/components/recordingcreator/seriesrecordingeditor.template.html
index 582c1a633c..86620a77d0 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"><span class="material-icons arrow_back"></span></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>
     <h3 class="formDialogHeaderTitle">
         ${HeaderSeriesOptions}
     </h3>
diff --git a/src/components/refreshdialog/refreshdialog.js b/src/components/refreshdialog/refreshdialog.js
index 44dbb0603e..890a89f36e 100644
--- a/src/components/refreshdialog/refreshdialog.js
+++ b/src/components/refreshdialog/refreshdialog.js
@@ -120,7 +120,7 @@ class RefreshDialog {
         const title = globalize.translate('RefreshMetadata');
 
         html += '<div class="formDialogHeader">';
-        html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
+        html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>';
         html += '<h3 class="formDialogHeaderTitle">';
         html += title;
         html += '</h3>';
diff --git a/src/components/remotecontrol/remotecontrol.js b/src/components/remotecontrol/remotecontrol.js
index 38eb27a2ba..eb789dfd6c 100644
--- a/src/components/remotecontrol/remotecontrol.js
+++ b/src/components/remotecontrol/remotecontrol.js
@@ -233,8 +233,8 @@ function updateNowPlayingInfo(context, state, serverId) {
         apiClient.getItem(apiClient.getCurrentUserId(), item.Id).then(function (fullItem) {
             const userData = fullItem.UserData || {};
             const likes = userData.Likes == null ? '' : userData.Likes;
-            context.querySelector('.nowPlayingPageUserDataButtonsTitle').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 + '"><span class="material-icons favorite"></span></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 + '"><span class="material-icons favorite"></span></button>';
+            context.querySelector('.nowPlayingPageUserDataButtonsTitle').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 + '"><span class="material-icons favorite" aria-hidden="true"></span></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 + '"><span class="material-icons favorite" aria-hidden="true"></span></button>';
         });
     } else {
         backdrop.clearBackdrop();
@@ -256,7 +256,7 @@ function setImageUrl(context, state, url) {
             context.querySelector('.nowPlayingPageImage').classList.remove('nowPlayingPageImageAudio');
         }
     } else {
-        imgContainer.innerHTML = '<div class="nowPlayingPageImageContainerNoAlbum"><button data-action="link" class="cardImageContainer coveredImage ' + cardBuilder.getDefaultBackgroundClass(item.Name) + ' cardContent cardContent-shadow itemAction"><span class="cardImageIcon material-icons album"></span></button></div>';
+        imgContainer.innerHTML = '<div class="nowPlayingPageImageContainerNoAlbum"><button data-action="link" class="cardImageContainer coveredImage ' + cardBuilder.getDefaultBackgroundClass(item.Name) + ' cardContent cardContent-shadow itemAction"><span class="cardImageIcon material-icons album" aria-hidden="true"></span></button></div>';
     }
 }
 
@@ -385,14 +385,14 @@ export default function () {
         const context = dlg;
         const toggleRepeatButtons = context.querySelectorAll('.repeatToggleButton');
         const cssClass = 'buttonActive';
-        let innHtml = '<span class="material-icons repeat"></span>';
+        let innHtml = '<span class="material-icons repeat" aria-hidden="true"></span>';
         let repeatOn = true;
 
         switch (repeatMode) {
             case 'RepeatAll':
                 break;
             case 'RepeatOne':
-                innHtml = '<span class="material-icons repeat_one"></span>';
+                innHtml = '<span class="material-icons repeat_one" aria-hidden="true"></span>';
                 break;
             case 'RepeatNone':
             default:
@@ -889,7 +889,7 @@ export default function () {
 
     function init(ownerView, context) {
         let volumecontrolHtml = '<div class="volumecontrol flex align-items-center flex-wrap-wrap justify-content-center">';
-        volumecontrolHtml += `<button is="paper-icon-button-light" class="buttonMute autoSize" title=${globalize.translate('Mute')}><span class="xlargePaperIconButton material-icons volume_up"></span></button>`;
+        volumecontrolHtml += `<button is="paper-icon-button-light" class="buttonMute autoSize" title=${globalize.translate('Mute')}><span class="xlargePaperIconButton material-icons volume_up" aria-hidden="true"></span></button>`;
         volumecontrolHtml += '<div class="sliderContainer nowPlayingVolumeSliderContainer"><input is="emby-slider" type="range" step="1" min="0" max="100" value="0" class="nowPlayingVolumeSlider"/></div>';
         volumecontrolHtml += '</div>';
         const optionsSection = context.querySelector('.playlistSectionButton');
diff --git a/src/components/search/SearchFields.tsx b/src/components/search/SearchFields.tsx
index 52209dd550..41d714c5d2 100644
--- a/src/components/search/SearchFields.tsx
+++ b/src/components/search/SearchFields.tsx
@@ -73,7 +73,7 @@ const SearchFields: FunctionComponent<SearchFieldsProps> = ({ onSearch = () => {
             ref={element}
         >
             <div className='searchFieldsInner flex align-items-center justify-content-center'>
-                <span className='searchfields-icon material-icons search' />
+                <span className='searchfields-icon material-icons search' aria-hidden='true' />
                 <div
                     className='inputContainer flex-grow'
                     style={{ marginBottom: 0 }}
diff --git a/src/components/slideshow/slideshow.js b/src/components/slideshow/slideshow.js
index 8f45590045..dd59ca08f8 100644
--- a/src/components/slideshow/slideshow.js
+++ b/src/components/slideshow/slideshow.js
@@ -114,7 +114,7 @@ function getImgUrl(item, user) {
 function getIcon(icon, cssClass, canFocus, autoFocus) {
     const tabIndex = canFocus ? '' : ' tabindex="-1"';
     autoFocus = autoFocus ? ' autofocus' : '';
-    return '<button is="paper-icon-button-light" class="autoSize ' + cssClass + '"' + tabIndex + autoFocus + '><span class="material-icons slideshowButtonIcon ' + icon + '"></span></button>';
+    return '<button is="paper-icon-button-light" class="autoSize ' + cssClass + '"' + tabIndex + autoFocus + '><span class="material-icons slideshowButtonIcon ' + icon + '" aria-hidden="true"></span></button>';
 }
 
 /**
diff --git a/src/components/sortmenu/sortmenu.js b/src/components/sortmenu/sortmenu.js
index 60392ad381..d9ea049370 100644
--- a/src/components/sortmenu/sortmenu.js
+++ b/src/components/sortmenu/sortmenu.js
@@ -63,7 +63,7 @@ class SortMenu {
             let html = '';
 
             html += '<div class="formDialogHeader">';
-            html += '<button is="paper-icon-button-light" class="btnCancel hide-mouse-idle-tv" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
+            html += '<button is="paper-icon-button-light" class="btnCancel hide-mouse-idle-tv" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>';
             html += '<h3 class="formDialogHeaderTitle">${Sort}</h3>';
 
             html += '</div>';
diff --git a/src/components/subtitleeditor/subtitleeditor.js b/src/components/subtitleeditor/subtitleeditor.js
index a58175a6c1..883cc29fbe 100644
--- a/src/components/subtitleeditor/subtitleeditor.js
+++ b/src/components/subtitleeditor/subtitleeditor.js
@@ -98,7 +98,7 @@ function fillSubtitleList(context, item) {
 
             itemHtml += '<' + tagName + ' class="' + className + '" data-index="' + s.Index + '">';
 
-            itemHtml += '<span class="listItemIcon material-icons closed_caption"></span>';
+            itemHtml += '<span class="listItemIcon material-icons closed_caption" aria-hidden="true"></span>';
 
             itemHtml += '<div class="listItemBody two-line">';
 
@@ -115,7 +115,7 @@ function fillSubtitleList(context, item) {
 
             if (!layoutManager.tv) {
                 if (s.Path) {
-                    itemHtml += '<button is="paper-icon-button-light" data-index="' + s.Index + '" title="' + globalize.translate('Delete') + '" class="btnDelete listItemButton"><span class="material-icons delete"></span></button>';
+                    itemHtml += '<button is="paper-icon-button-light" data-index="' + s.Index + '" title="' + globalize.translate('Delete') + '" class="btnDelete listItemButton"><span class="material-icons delete" aria-hidden="true"></span></button>';
                 }
             }
 
@@ -193,7 +193,7 @@ function renderSearchResults(context, results) {
 
         html += '<' + tagName + ' class="' + className + '" data-subid="' + result.Id + '">';
 
-        html += '<span class="listItemIcon material-icons closed_caption"></span>';
+        html += '<span class="listItemIcon material-icons closed_caption" aria-hidden="true"></span>';
 
         const bodyClass = result.Comment || result.IsHashMatch ? 'three-line' : 'two-line';
 
@@ -222,7 +222,7 @@ function renderSearchResults(context, results) {
         html += '</div>';
 
         if (!layoutManager.tv) {
-            html += '<button type="button" is="paper-icon-button-light" data-subid="' + result.Id + '" class="btnDownload listItemButton"><span class="material-icons file_download"></span></button>';
+            html += '<button type="button" is="paper-icon-button-light" data-subid="' + result.Id + '" class="btnDownload listItemButton"><span class="material-icons file_download" aria-hidden="true"></span></button>';
         }
 
         html += '</' + tagName + '>';
diff --git a/src/components/subtitleeditor/subtitleeditor.template.html b/src/components/subtitleeditor/subtitleeditor.template.html
index b01942c995..f70119db0f 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"><span class="material-icons arrow_back"></span></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>
     <h3 class="formDialogHeaderTitle">${Subtitles}</h3>
 
-    <a is="emby-linkbutton" rel="noopener noreferrer" 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}"><span class="material-icons info"></span><span style="margin-left:.25em;">${Help}</span></a>
+    <a is="emby-linkbutton" rel="noopener noreferrer" 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}"><span class="material-icons info" aria-hidden="true"></span><span style="margin-left:.25em;">${Help}</span></a>
 </div>
 <div class="formDialogContent smoothScrollY">
     <div class="dialogContentInner dialog-content-centered">
@@ -17,8 +17,8 @@
                 <div class="selectContainer flex-grow" style="margin-bottom: 0;">
                     <select is="emby-select" id="selectLanguage" required="required" label="${LabelLanguage}" autofocus></select>
                 </div>
-                <button type="submit" is="paper-icon-button-light" title="${Search}" class="btnSearchSubtitles flex-shrink-zero emby-select-iconbutton"><span class="material-icons search"></span></button>
-                <button type="button" is="paper-icon-button-light" title="${Upload}" class="btnOpenUploadMenu flex-shrink-zero emby-select-iconbutton"><span class="material-icons add"></span></button>
+                <button type="submit" is="paper-icon-button-light" title="${Search}" class="btnSearchSubtitles flex-shrink-zero emby-select-iconbutton"><span class="material-icons search" aria-hidden="true"></span></button>
+                <button type="button" is="paper-icon-button-light" title="${Upload}" class="btnOpenUploadMenu flex-shrink-zero emby-select-iconbutton"><span class="material-icons add" aria-hidden="true"></span></button>
             </div>
             <button is="emby-button" type="submit" class="raised btnSubmit block button-submit">${Search}</button>
         </form>
diff --git a/src/components/subtitlesync/subtitlesync.template.html b/src/components/subtitlesync/subtitlesync.template.html
index 8de7541635..fcd86dbc32 100644
--- a/src/components/subtitlesync/subtitlesync.template.html
+++ b/src/components/subtitlesync/subtitlesync.template.html
@@ -1,6 +1,6 @@
 <div class="subtitleSync">
     <div class="subtitleSyncContainer">
-        <button type="button" is="paper-icon-button-light" class="subtitleSync-closeButton"><span class="material-icons close"></span></button>
+        <button type="button" is="paper-icon-button-light" class="subtitleSync-closeButton"><span class="material-icons close" aria-hidden="true"></span></button>
         <div class="subtitleSyncTextField" contenteditable="true" spellcheck="false">0s</div>
         <div class="sliderContainer subtitleSyncSliderContainer">
             <input is="emby-slider" type="range" step=".1" min="0" max="100" value="50" class="subtitleSyncSlider" data-slider-keep-progress="true" />
diff --git a/src/components/subtitleuploader/subtitleuploader.js b/src/components/subtitleuploader/subtitleuploader.js
index 500b1706bb..a4a7d2d8d6 100644
--- a/src/components/subtitleuploader/subtitleuploader.js
+++ b/src/components/subtitleuploader/subtitleuploader.js
@@ -61,7 +61,7 @@ function setFiles(page, files) {
     reader.onload = (function (theFile) {
         return function () {
             // Render file.
-            const html = '<a><i class="material-icons" style="transform: translateY(25%);">subtitles</i><span>' + escape(theFile.name) + '</span><a/>';
+            const html = '<a><span class="material-icons subtitles" aria-hidden="true" style="transform: translateY(25%);"></span><span>' + escape(theFile.name) + '</span><a/>';
 
             page.querySelector('#subtitleOutput').innerHTML = html;
             page.querySelector('#fldUpload').classList.remove('hide');
diff --git a/src/components/subtitleuploader/subtitleuploader.template.html b/src/components/subtitleuploader/subtitleuploader.template.html
index 3f4944de57..d3c89380bc 100644
--- a/src/components/subtitleuploader/subtitleuploader.template.html
+++ b/src/components/subtitleuploader/subtitleuploader.template.html
@@ -1,5 +1,5 @@
 <div class="formDialogHeader">
-    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><em class="material-icons arrow_back"></em></button>
+    <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>
     <h3 class="formDialogHeaderTitle">
         ${HeaderUploadSubtitle}
     </h3>
@@ -14,7 +14,7 @@
                 <h2 style="margin:0;">${HeaderAddUpdateSubtitle}</h2>
 
                 <button is="emby-button" type="button" class="raised raised-mini btnBrowse" style="margin-left:1.5em;">
-                    <em class="material-icons">folder</em>
+                    <span class="material-icons folder" aria-hidden="true"></span>
                     <span>${Browse}</span>
                 </button>
             </div>
diff --git a/src/components/syncPlay/ui/settings/editor.html b/src/components/syncPlay/ui/settings/editor.html
index 6267d9cf0a..1ffc2d4c04 100644
--- a/src/components/syncPlay/ui/settings/editor.html
+++ b/src/components/syncPlay/ui/settings/editor.html
@@ -1,6 +1,6 @@
 <div class="formDialogHeader">
     <button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
-        <span class="material-icons arrow_back"></span>
+        <span class="material-icons arrow_back" aria-hidden="true"></span>
     </button>
     <h3 class="formDialogHeaderTitle">${HeaderSyncPlaySettings}</h3>
 </div>
diff --git a/src/components/tunerPicker.js b/src/components/tunerPicker.js
index 95c32df068..aba21acdfc 100644
--- a/src/components/tunerPicker.js
+++ b/src/components/tunerPicker.js
@@ -50,7 +50,7 @@ function getDeviceHtml(device) {
     html += '<div class="cardScalable visualCardBox-cardScalable">';
     html += '<div class="' + padderClass + '"></div>';
     html += '<div class="cardContent searchImage">';
-    html += '<div class="cardImageContainer coveredImage"><span class="cardImageIcon material-icons dvr"></span></div>';
+    html += '<div class="cardImageContainer coveredImage"><span class="cardImageIcon material-icons dvr" aria-hidden="true"></span></div>';
     html += '</div>';
     html += '</div>';
     html += '<div class="cardFooter visualCardBox-cardFooter">';
@@ -135,7 +135,7 @@ function tunerPicker() {
         dlg.classList.add('formDialog');
         let html = '';
         html += '<div class="formDialogHeader">';
-        html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
+        html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>';
         html += '<h3 class="formDialogHeaderTitle">';
         html += globalize.translate('HeaderLiveTvTunerSetup');
         html += '</h3>';
diff --git a/src/components/tvproviders/xmltv.template.html b/src/components/tvproviders/xmltv.template.html
index 010e66ea0d..ad82d880c2 100644
--- a/src/components/tvproviders/xmltv.template.html
+++ b/src/components/tvproviders/xmltv.template.html
@@ -12,7 +12,7 @@
                 <div style="flex-grow:1;">
                     <input is="emby-input" class="txtPath" label="${LabelFileOrUrl}" required="required" autocomplete="off" />
                 </div>
-                <button type="button" is="paper-icon-button-light" id="btnSelectPath" class="emby-input-iconbutton"><span class="material-icons search"></span></button>
+                <button type="button" is="paper-icon-button-light" id="btnSelectPath" class="emby-input-iconbutton"><span class="material-icons search" aria-hidden="true"></span></button>
             </div>
             <div class="fieldDescription">${XmlTvPathHelp}</div>
         </div>
diff --git a/src/components/userdatabuttons/userdatabuttons.js b/src/components/userdatabuttons/userdatabuttons.js
index e7b97da997..da536810ea 100644
--- a/src/components/userdatabuttons/userdatabuttons.js
+++ b/src/components/userdatabuttons/userdatabuttons.js
@@ -35,7 +35,7 @@ function getUserDataButtonHtml(method, itemId, serverId, buttonCssClass, iconCss
 
     iconCssClass += 'material-icons';
 
-    return '<button title="' + tooltip + '" data-itemid="' + itemId + '" data-serverid="' + serverId + '" is="' + is + '" data-method="' + method + '" class="' + className + '"><span class="' + iconCssClass + ' ' + icon + '"></span></button>';
+    return `<button title="${tooltip}" data-itemid="${itemId}" data-serverid="${serverId}" is="${is}" data-method="${method}" class="${className}"><span class="${iconCssClass} ${icon}" aria-hidden="true"></span></button>`;
 }
 
 function onContainerClick(e) {
diff --git a/src/components/viewSettings/viewSettings.js b/src/components/viewSettings/viewSettings.js
index ca88481cea..95e41b1b3b 100644
--- a/src/components/viewSettings/viewSettings.js
+++ b/src/components/viewSettings/viewSettings.js
@@ -78,7 +78,7 @@ class ViewSettings {
             let html = '';
 
             html += '<div class="formDialogHeader">';
-            html += '<button is="paper-icon-button-light" class="btnCancel hide-mouse-idle-tv" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
+            html += '<button is="paper-icon-button-light" class="btnCancel hide-mouse-idle-tv" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>';
             html += '<h3 class="formDialogHeaderTitle">${Settings}</h3>';
 
             html += '</div>';
diff --git a/src/controllers/dashboard/dashboard.html b/src/controllers/dashboard/dashboard.html
index 423cfa4c69..1077a1ef5e 100644
--- a/src/controllers/dashboard/dashboard.html
+++ b/src/controllers/dashboard/dashboard.html
@@ -5,7 +5,7 @@
                 <div class="dashboardSection">
                     <a is="emby-linkbutton" href="#!/dashboardgeneral.html" class="button-flat sectionTitleTextButton">
                         <h3>${TabServer}</h3>
-                        <span class="material-icons chevron_right"></span>
+                        <span class="material-icons chevron_right" aria-hidden="true"></span>
                     </a>
 
                     <div class="paperList" style="padding: 1em;">
@@ -37,7 +37,7 @@
                 <div class="dashboardSection">
                     <a is="emby-linkbutton" href="#!/devices.html" class="button-flat sectionTitleTextButton">
                         <h3>${HeaderActiveDevices}</h3>
-                        <span class="material-icons chevron_right"></span>
+                        <span class="material-icons chevron_right" aria-hidden="true"></span>
                     </a>
                     <div class="activeDevices itemsContainer vertical-wrap">
                     </div>
@@ -48,7 +48,7 @@
                 <div class="dashboardSection">
                     <a is="emby-linkbutton" href="#!/serveractivity.html?useractivity=true" class="button-flat sectionTitleTextButton">
                         <h3>${HeaderActivity}</h3>
-                        <span class="material-icons chevron_right"></span>
+                        <span class="material-icons chevron_right" aria-hidden="true"></span>
                     </a>
                     <div class="paperList userActivityItems" data-activitylimit="7" data-useractivity="true">
                     </div>
@@ -65,7 +65,7 @@
                 <div class="dashboardSection serverActivitySection hide activityContainer">
                     <a is="emby-linkbutton" href="#!/serveractivity.html?useractivity=false" class="button-flat sectionTitleTextButton">
                         <h3>${Alerts}</h3>
-                        <span class="material-icons chevron_right"></span>
+                        <span class="material-icons chevron_right" aria-hidden="true"></span>
                     </a>
                     <div class="paperList serverActivityItems" data-activitylimit="4" data-useractivity="false">
                     </div>
@@ -74,7 +74,7 @@
                 <div class="dashboardSection">
                     <a is="emby-linkbutton" href="#!/dashboardgeneral.html" class="button-flat sectionTitleTextButton">
                         <h3>${HeaderPaths}</h3>
-                        <span class="material-icons chevron_right"></span>
+                        <span class="material-icons chevron_right" aria-hidden="true"></span>
                     </a>
                     <div class="paperList">
                         <div class="listItem listItem-border">
diff --git a/src/controllers/dashboard/dashboard.js b/src/controllers/dashboard/dashboard.js
index 3f32f0a284..b7468c266d 100644
--- a/src/controllers/dashboard/dashboard.js
+++ b/src/controllers/dashboard/dashboard.js
@@ -315,12 +315,12 @@ import confirm from '../../components/confirm/confirm';
                 let btnCssClass = session.ServerId && session.NowPlayingItem && session.SupportsRemoteControl ? '' : ' hide';
                 const playIcon = session.PlayState.IsPaused ? 'pause' : 'play_arrow';
 
-                html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionPlayPause paper-icon-button-light ' + btnCssClass + '"><span class="material-icons ' + playIcon + '"></span></button>';
-                html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionStop paper-icon-button-light ' + btnCssClass + '"><span class="material-icons stop"></span></button>';
-                html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionInfo paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate('ViewPlaybackInfo') + '"><span class="material-icons info"></span></button>';
+                html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionPlayPause paper-icon-button-light ' + btnCssClass + '"><span class="material-icons ' + playIcon + '" aria-hidden="true"></span></button>';
+                html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionStop paper-icon-button-light ' + btnCssClass + '"><span class="material-icons stop" aria-hidden="true"></span></button>';
+                html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionInfo paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate('ViewPlaybackInfo') + '"><span class="material-icons info" aria-hidden="true"></span></button>';
 
                 btnCssClass = session.ServerId && session.SupportedCommands.indexOf('DisplayMessage') !== -1 && session.DeviceId !== ServerConnections.deviceId() ? '' : ' hide';
-                html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionSendMessage paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate('SendMessage') + '"><span class="material-icons message"></span></button>';
+                html += '<button is="paper-icon-button-light" class="sessionCardButton btnSessionSendMessage paper-icon-button-light ' + btnCssClass + '" title="' + globalize.translate('SendMessage') + '"><span class="material-icons message" aria-hidden="true"></span></button>';
                 html += '</div>';
 
                 html += '<div class="flex align-items-center justify-content-center">';
@@ -372,7 +372,7 @@ import confirm from '../../components/confirm/confirm';
                 html += progress + '%';
                 html += '</progress>';
                 html += "<span style='color:#00a4dc;margin-left:5px;margin-right:5px;'>" + progress + '%</span>';
-                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonStop') + '" onclick="DashboardPage.stopTask(this, \'' + task.Id + '\');" class="autoSize"><span class="material-icons cancel"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" title="' + globalize.translate('ButtonStop') + '" onclick="DashboardPage.stopTask(this, \'' + task.Id + '\');" class="autoSize"><span class="material-icons cancel" aria-hidden="true"></span></button>';
             } else if (task.State === 'Cancelling') {
                 html += '<span style="color:#cc0000;">' + globalize.translate('LabelStopping') + '</span>';
             }
diff --git a/src/controllers/dashboard/devices/devices.js b/src/controllers/dashboard/devices/devices.js
index 3d5dbcf3bb..a75eebce31 100644
--- a/src/controllers/dashboard/devices/devices.js
+++ b/src/controllers/dashboard/devices/devices.js
@@ -104,7 +104,7 @@ import confirm from '../../../components/confirm/confirm';
                 deviceHtml += '<div class="cardImage" style="background-image:url(\'' + iconUrl + "');background-size: auto 64%;background-position:center center;\">";
                 deviceHtml += '</div>';
             } else {
-                deviceHtml += '<span class="cardImageIcon material-icons tablet_android"></span>';
+                deviceHtml += '<span class="cardImageIcon material-icons tablet_android" aria-hidden="true"></span>';
             }
 
             deviceHtml += '</a>';
@@ -113,7 +113,7 @@ import confirm from '../../../components/confirm/confirm';
 
             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"><span class="material-icons more_vert"></span></button>';
+                deviceHtml += '<button type="button" is="paper-icon-button-light" data-id="' + device.Id + '" title="' + globalize.translate('Menu') + '" class="btnDeviceMenu"><span class="material-icons more_vert" aria-hidden="true"></span></button>';
                 deviceHtml += '</div>';
             }
 
diff --git a/src/controllers/dashboard/dlna/profile.html b/src/controllers/dashboard/dlna/profile.html
index 22edffed99..7e711604c2 100644
--- a/src/controllers/dashboard/dlna/profile.html
+++ b/src/controllers/dashboard/dlna/profile.html
@@ -97,7 +97,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="${Add}">
-                                    <span class="material-icons add"></span>
+                                    <span class="material-icons add" aria-hidden="true"></span>
                                 </button>
                             </div>
                             <div class="httpHeaderIdentificationList"></div>
@@ -220,7 +220,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="${Add}">
-                                    <span class="material-icons add"></span>
+                                    <span class="material-icons add" aria-hidden="true"></span>
                                 </button>
                             </div>
                             <div class="xmlDocumentAttributeList"></div>
diff --git a/src/controllers/dashboard/dlna/profile.js b/src/controllers/dashboard/dlna/profile.js
index e54e1e3fc7..0962f7a592 100644
--- a/src/controllers/dashboard/dlna/profile.js
+++ b/src/controllers/dashboard/dlna/profile.js
@@ -86,12 +86,12 @@ import toast from '../../../components/toast/toast';
         let index = 0;
         const html = '<div class="paperList">' + headers.map(function (h) {
             let li = '<div class="listItem">';
-            li += '<span class="material-icons listItemIcon info"></span>';
+            li += '<span class="material-icons listItemIcon info" aria-hidden="true"></span>';
             li += '<div class="listItemBody">';
             li += '<h3 class="listItemBodyText">' + h.Name + ': ' + (h.Value || '') + '</h3>';
             li += '<div class="listItemBodyText secondary">' + (h.Match || '') + '</div>';
             li += '</div>';
-            li += '<button type="button" is="paper-icon-button-light" class="btnDeleteIdentificationHeader listItemButton" data-index="' + index + '"><span class="material-icons delete"></span></button>';
+            li += '<button type="button" is="paper-icon-button-light" class="btnDeleteIdentificationHeader listItemButton" data-index="' + index + '"><span class="material-icons delete" aria-hidden="true"></span></button>';
             li += '</div>';
             index++;
             return li;
@@ -142,11 +142,11 @@ import toast from '../../../components/toast/toast';
     function renderXmlDocumentAttributes(page, attribute) {
         const html = '<div class="paperList">' + attribute.map(function (h) {
             let li = '<div class="listItem">';
-            li += '<span class="material-icons listItemIcon info"></span>';
+            li += '<span class="material-icons listItemIcon info" aria-hidden="true"></span>';
             li += '<div class="listItemBody">';
             li += '<h3 class="listItemBodyText">' + h.Name + ' = ' + (h.Value || '') + '</h3>';
             li += '</div>';
-            li += '<button type="button" is="paper-icon-button-light" class="btnDeleteXmlAttribute listItemButton" data-index="0"><span class="material-icons delete"></span></button>';
+            li += '<button type="button" is="paper-icon-button-light" class="btnDeleteXmlAttribute listItemButton" data-index="0"><span class="material-icons delete" aria-hidden="true"></span></button>';
             return li += '</div>';
         }).join('') + '</div>';
         const elem = $('.xmlDocumentAttributeList', page).html(html).trigger('create');
@@ -184,11 +184,11 @@ import toast from '../../../components/toast/toast';
         let index = 0;
         const html = '<div class="paperList">' + profiles.map(function (h) {
             let li = '<div class="listItem lnkEditSubProfile" data-index="' + index + '">';
-            li += '<span class="material-icons listItemIcon info"></span>';
+            li += '<span class="material-icons listItemIcon info" aria-hidden="true"></span>';
             li += '<div class="listItemBody">';
             li += '<h3 class="listItemBodyText">' + (h.Format || '') + '</h3>';
             li += '</div>';
-            li += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-index="' + index + '"><span class="material-icons delete"></span></button>';
+            li += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-index="' + index + '"><span class="material-icons delete" aria-hidden="true"></span></button>';
             li += '</div>';
             index++;
             return li;
@@ -278,7 +278,7 @@ import toast from '../../../components/toast/toast';
             }
 
             html += '</a>';
-            html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-profileindex="' + index + '"><span class="material-icons delete"></span></button>';
+            html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-profileindex="' + index + '"><span class="material-icons delete" aria-hidden="true"></span></button>';
             html += '</div>';
         }
 
@@ -339,7 +339,7 @@ import toast from '../../../components/toast/toast';
             }
 
             html += '</a>';
-            html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-profileindex="' + i + '"><span class="material-icons delete"></span></button>';
+            html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-profileindex="' + i + '"><span class="material-icons delete" aria-hidden="true"></span></button>';
             html += '</div>';
         }
 
@@ -423,7 +423,7 @@ import toast from '../../../components/toast/toast';
             }
 
             html += '</a>';
-            html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-profileindex="' + i + '"><span class="material-icons delete"></span></button>';
+            html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-profileindex="' + i + '"><span class="material-icons delete" aria-hidden="true"></span></button>';
             html += '</div>';
         }
 
@@ -495,7 +495,7 @@ import toast from '../../../components/toast/toast';
             }
 
             html += '</a>';
-            html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-profileindex="' + i + '"><span class="material-icons delete"></span></button>';
+            html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-profileindex="' + i + '"><span class="material-icons delete" aria-hidden="true"></span></button>';
             html += '</div>';
         }
 
@@ -575,7 +575,7 @@ import toast from '../../../components/toast/toast';
             }
 
             html += '</a>';
-            html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-profileindex="' + i + '"><span class="material-icons delete"></span></button>';
+            html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile listItemButton" data-profileindex="' + i + '"><span class="material-icons delete" aria-hidden="true"></span></button>';
             html += '</div>';
         }
 
diff --git a/src/controllers/dashboard/dlna/profiles.html b/src/controllers/dashboard/dlna/profiles.html
index acfbc0c2a4..c1170621d5 100644
--- a/src/controllers/dashboard/dlna/profiles.html
+++ b/src/controllers/dashboard/dlna/profiles.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">
-                            <span class="material-icons add"></span>
+                            <span class="material-icons add" aria-hidden="true"></span>
                         </a>
                     </div>
 
diff --git a/src/controllers/dashboard/dlna/profiles.js b/src/controllers/dashboard/dlna/profiles.js
index 5d394da428..40e1b2ee72 100644
--- a/src/controllers/dashboard/dlna/profiles.js
+++ b/src/controllers/dashboard/dlna/profiles.js
@@ -39,7 +39,7 @@ import confirm from '../../../components/confirm/confirm';
         for (let i = 0, length = profiles.length; i < length; i++) {
             const profile = profiles[i];
             html += '<div class="listItem listItem-border">';
-            html += '<span class="listItemIcon material-icons live_tv"></span>';
+            html += '<span class="listItemIcon material-icons live_tv" aria-hidden="true"></span>';
             html += '<div class="listItemBody two-line">';
             html += "<a is='emby-linkbutton' style='padding:0;margin:0;' data-ripple='false' class='clearLink' href='#!/dlnaprofile.html?id=" + profile.Id + "'>";
             html += '<div>' + profile.Name + '</div>';
@@ -47,7 +47,7 @@ import confirm from '../../../components/confirm/confirm';
             html += '</div>';
 
             if (profile.Type == 'User') {
-                html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile" data-profileid="' + profile.Id + '" title="' + globalize.translate('Delete') + '"><span class="material-icons delete"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" class="btnDeleteProfile" data-profileid="' + profile.Id + '" title="' + globalize.translate('Delete') + '"><span class="material-icons delete" aria-hidden="true"></span></button>';
             }
 
             html += '</div>';
diff --git a/src/controllers/dashboard/encodingsettings.html b/src/controllers/dashboard/encodingsettings.html
index f2a12bf9a2..2266bfac3c 100644
--- a/src/controllers/dashboard/encodingsettings.html
+++ b/src/controllers/dashboard/encodingsettings.html
@@ -211,7 +211,7 @@
                         <div style="flex-grow:1;">
                             <input is="emby-input" class="txtEncoderPath" label="${LabelffmpegPath}" autocomplete="off" />
                         </div>
-                        <button type="button" is="paper-icon-button-light" id="btnSelectEncoderPath" class="emby-input-iconbutton"><span class="material-icons search"></span></button>
+                        <button type="button" is="paper-icon-button-light" id="btnSelectEncoderPath" class="emby-input-iconbutton"><span class="material-icons search" aria-hidden="true"></span></button>
                     </div>
                     <div class="fieldDescription">
                         <div>${LabelffmpegPathHelp}</div>
@@ -222,7 +222,7 @@
                         <div style="flex-grow:1;">
                             <input is="emby-input" id="txtTranscodingTempPath" label="${LabelTranscodePath}" autocomplete="off" />
                         </div>
-                        <button type="button" is="paper-icon-button-light" id="btnSelectTranscodingTempPath" class="emby-input-iconbutton"><span class="material-icons search"></span></button>
+                        <button type="button" is="paper-icon-button-light" id="btnSelectTranscodingTempPath" class="emby-input-iconbutton"><span class="material-icons search" aria-hidden="true"></span></button>
                     </div>
                     <div class="fieldDescription">${LabelTranscodingTempPathHelp}</div>
                 </div>
@@ -231,7 +231,7 @@
                         <div style="flex-grow:1;">
                             <input is="emby-input" id="txtFallbackFontPath" label="${LabelFallbackFontPath}" autocomplete="off" />
                         </div>
-                        <button type="button" is="paper-icon-button-light" id="btnSelectFallbackFontPath" class="emby-input-iconbutton"><span class="material-icons search"></span></button>
+                        <button type="button" is="paper-icon-button-light" id="btnSelectFallbackFontPath" class="emby-input-iconbutton"><span class="material-icons search" aria-hidden="true"></span></button>
                     </div>
                     <div class="fieldDescription">${LabelFallbackFontPathHelp}</div>
                 </div>
diff --git a/src/controllers/dashboard/general.html b/src/controllers/dashboard/general.html
index 21c81eddd7..8c228fd069 100644
--- a/src/controllers/dashboard/general.html
+++ b/src/controllers/dashboard/general.html
@@ -32,7 +32,7 @@
                             <div style="flex-grow:1;">
                                 <input is="emby-input" id="txtCachePath" label="${LabelCachePath}" autocomplete="off" />
                             </div>
-                            <button type="button" is="paper-icon-button-light" id="btnSelectCachePath" title="${ButtonSelectDirectory}" class="emby-input-iconbutton"><span class="material-icons search"></span></button>
+                            <button type="button" is="paper-icon-button-light" id="btnSelectCachePath" title="${ButtonSelectDirectory}" class="emby-input-iconbutton"><span class="material-icons search" aria-hidden="true"></span></button>
                         </div>
                         <div class="fieldDescription">${LabelCachePathHelp}</div>
                     </div>
@@ -42,7 +42,7 @@
                             <div style="flex-grow:1;">
                                 <input is="emby-input" id="txtMetadataPath" label="${LabelMetadataPath}" autocomplete="off" />
                             </div>
-                            <button type="button" is="paper-icon-button-light" id="btnSelectMetadataPath" title="${ButtonSelectDirectory}" class="emby-input-iconbutton"><span class="material-icons search"></span></button>
+                            <button type="button" is="paper-icon-button-light" id="btnSelectMetadataPath" title="${ButtonSelectDirectory}" class="emby-input-iconbutton"><span class="material-icons search" aria-hidden="true"></span></button>
                         </div>
                         <div class="fieldDescription">${LabelMetadataPathHelp}</div>
                         <input type="hidden" id="txtMetadataNetworkPath" />
diff --git a/src/controllers/dashboard/library.js b/src/controllers/dashboard/library.js
index e8b9301a93..e94b9ee909 100644
--- a/src/controllers/dashboard/library.js
+++ b/src/controllers/dashboard/library.js
@@ -280,7 +280,7 @@ import cardBuilder from '../../components/cardbuilder/cardBuilder';
             hasCardImageContainer = true;
         } else if (!virtualFolder.showNameWithIcon) {
             html += `<div class="cardImageContainer editLibrary ${cardBuilder.getDefaultBackgroundClass()}" style="cursor:pointer;">`;
-            html += '<span class="cardImageIcon material-icons ' + (virtualFolder.icon || imageHelper.getLibraryIcon(virtualFolder.CollectionType)) + '"></span>';
+            html += '<span class="cardImageIcon material-icons ' + (virtualFolder.icon || imageHelper.getLibraryIcon(virtualFolder.CollectionType)) + '" aria-hidden="true"></span>';
             hasCardImageContainer = true;
         }
 
@@ -293,7 +293,7 @@ import cardBuilder from '../../components/cardbuilder/cardBuilder';
 
         if (!imgUrl && virtualFolder.showNameWithIcon) {
             html += '<h3 class="cardImageContainer addLibrary" style="position:absolute;top:0;left:0;right:0;bottom:0;cursor:pointer;flex-direction:column;">';
-            html += '<span class="cardImageIcon material-icons ' + (virtualFolder.icon || imageHelper.getLibraryIcon(virtualFolder.CollectionType)) + '"></span>';
+            html += '<span class="cardImageIcon material-icons ' + (virtualFolder.icon || imageHelper.getLibraryIcon(virtualFolder.CollectionType)) + '" aria-hidden="true"></span>';
 
             if (virtualFolder.showNameWithIcon) {
                 html += '<div style="margin:1em 0;position:width:100%;">';
@@ -310,7 +310,7 @@ import cardBuilder from '../../components/cardbuilder/cardBuilder';
 
         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"><span class="material-icons more_vert"></span></button>';
+            html += '<button type="button" is="paper-icon-button-light" class="btnCardMenu autoSize"><span class="material-icons more_vert" aria-hidden="true"></span></button>';
             html += '</div>';
         }
 
diff --git a/src/controllers/dashboard/networking.html b/src/controllers/dashboard/networking.html
index ed6a7b00fc..44edb4c4a8 100644
--- a/src/controllers/dashboard/networking.html
+++ b/src/controllers/dashboard/networking.html
@@ -66,7 +66,7 @@
                                 <div style="flex-grow:1;">
                                     <input is="emby-input" type="text" id="txtCertificatePath" label="${LabelCustomCertificatePath}" autocomplete="off" />
                                 </div>
-                                <button type="button" is="paper-icon-button-light" id="btnSelectCertPath" title="${ButtonSelectDirectory}" class="emby-input-iconbutton"><span class="material-icons search"></span></button>
+                                <button type="button" is="paper-icon-button-light" id="btnSelectCertPath" title="${ButtonSelectDirectory}" class="emby-input-iconbutton"><span class="material-icons search" aria-hidden="true"></span></button>
                             </div>
                             <div class="fieldDescription">${LabelCustomCertificatePathHelp}</div>
                         </div>
diff --git a/src/controllers/dashboard/notifications/notifications/index.js b/src/controllers/dashboard/notifications/notifications/index.js
index befb64c383..1b91b5c58d 100644
--- a/src/controllers/dashboard/notifications/notifications/index.js
+++ b/src/controllers/dashboard/notifications/notifications/index.js
@@ -33,14 +33,14 @@ function reload(page) {
             }
             itemHtml += '<a class="listItem listItem-border" is="emby-linkbutton" data-ripple="false" href="notificationsetting.html?type=' + notification.Type + '">';
             if (notification.Enabled) {
-                itemHtml += '<span class="listItemIcon material-icons notifications_active"></span>';
+                itemHtml += '<span class="listItemIcon material-icons notifications_active" aria-hidden="true"></span>';
             } else {
-                itemHtml += '<span class="listItemIcon material-icons notifications_off" style="background-color:#999;"></span>';
+                itemHtml += '<span class="listItemIcon material-icons notifications_off" aria-hidden="true" style="background-color:#999;"></span>';
             }
             itemHtml += '<div class="listItemBody">';
             itemHtml += '<div class="listItemBodyText">' + notification.Name + '</div>';
             itemHtml += '</div>';
-            itemHtml += '<button type="button" is="paper-icon-button-light"><span class="material-icons mode_edit"></span></button>';
+            itemHtml += '<button type="button" is="paper-icon-button-light"><span class="material-icons mode_edit" aria-hidden="true"></span></button>';
             itemHtml += '</a>';
             return itemHtml;
         }).join('');
diff --git a/src/controllers/dashboard/plugins/available/index.js b/src/controllers/dashboard/plugins/available/index.js
index c13c1c89b5..e24d4a144f 100644
--- a/src/controllers/dashboard/plugins/available/index.js
+++ b/src/controllers/dashboard/plugins/available/index.js
@@ -110,7 +110,7 @@ function getPluginHtml(plugin, options, installedPlugins) {
         html += `<img src="${plugin.imageUrl}" style="width:100%" />`;
     } else {
         html += `<div class="cardImage flex align-items-center justify-content-center ${cardBuilder.getDefaultBackgroundClass()}">`;
-        html += '<span class="cardImageIcon material-icons extension"></span>';
+        html += '<span class="cardImageIcon material-icons extension" aria-hidden="true"></span>';
         html += '</div>';
     }
 
diff --git a/src/controllers/dashboard/plugins/installed/index.js b/src/controllers/dashboard/plugins/installed/index.js
index 3f95b44056..7c5ac0ccb9 100644
--- a/src/controllers/dashboard/plugins/installed/index.js
+++ b/src/controllers/dashboard/plugins/installed/index.js
@@ -74,7 +74,7 @@ function getPluginCardHtml(plugin, pluginConfigurationPages) {
         html += `<img src="${imageUrl}" style="width:100%" />`;
     } else {
         html += `<div class="cardImage flex align-items-center justify-content-center ${cardBuilder.getDefaultBackgroundClass()}">`;
-        html += '<span class="cardImageIcon material-icons extension"></span>';
+        html += '<span class="cardImageIcon material-icons extension" aria-hidden="true"></span>';
         html += '</div>';
     }
     html += configPageUrl ? '</a>' : '</div>';
@@ -84,7 +84,7 @@ function getPluginCardHtml(plugin, pluginConfigurationPages) {
 
     if (configPage || plugin.CanUninstall) {
         html += '<div style="text-align:right; float:right;padding-top:5px;">';
-        html += '<button type="button" is="paper-icon-button-light" class="btnCardMenu autoSize"><span class="material-icons more_vert"></span></button>';
+        html += '<button type="button" is="paper-icon-button-light" class="btnCardMenu autoSize"><span class="material-icons more_vert" aria-hidden="true"></span></button>';
         html += '</div>';
     }
 
diff --git a/src/controllers/dashboard/plugins/repositories/index.js b/src/controllers/dashboard/plugins/repositories/index.js
index bed1be1a6f..3a1f0f5d2a 100644
--- a/src/controllers/dashboard/plugins/repositories/index.js
+++ b/src/controllers/dashboard/plugins/repositories/index.js
@@ -65,13 +65,13 @@ function getRepositoryHtml(repository) {
 
     html += '<div class="listItem listItem-border">';
     html += `<a is="emby-linkbutton" style="margin:0;padding:0" class="clearLink listItemIconContainer" href="${repository.Url}" rel="noopener noreferrer" target="_blank">`;
-    html += '<span class="material-icons listItemIcon open_in_new"></span>';
+    html += '<span class="material-icons listItemIcon open_in_new" aria-hidden="true"></span>';
     html += '</a>';
     html += '<div class="listItemBody two-line">';
     html += `<h3 class="listItemBodyText">${repository.Name}</h3>`;
     html += `<div class="listItemBodyText secondary">${repository.Url}</div>`;
     html += '</div>';
-    html += `<button type="button" is="paper-icon-button-light" id="${repository.Url}" class="btnDelete" title="${globalize.translate('Delete')}"><span class="material-icons delete"></span></button>`;
+    html += `<button type="button" is="paper-icon-button-light" id="${repository.Url}" class="btnDelete" title="${globalize.translate('Delete')}"><span class="material-icons delete" aria-hidden="true"></span></button>`;
     html += '</div>';
 
     return html;
@@ -117,7 +117,7 @@ export default function(view) {
         let html = '';
 
         html += '<div class="formDialogHeader">';
-        html += '<button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back"></span></button>';
+        html += '<button type="button" is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><span class="material-icons arrow_back" aria-hidden="true"></span></button>';
         html += `<h3 class="formDialogHeaderTitle">${globalize.translate('HeaderNewRepository')}</h3>`;
         html += '</div>';
         html += '<form class="newPluginForm" style="margin:4em">';
diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtask.html b/src/controllers/dashboard/scheduledtasks/scheduledtask.html
index 8d0b2e24e0..6e1c7cfefc 100644
--- a/src/controllers/dashboard/scheduledtasks/scheduledtask.html
+++ b/src/controllers/dashboard/scheduledtasks/scheduledtask.html
@@ -13,7 +13,7 @@
                 <div>
                     <h2 style="vertical-align: middle; display: inline-block;">${HeaderTaskTriggers}</h2>
                     <button is="emby-button" type="button" class="fab fab-mini btnAddTrigger submit" style="margin-left: 1em;" title="${ButtonAddScheduledTaskTrigger}">
-                        <span class="material-icons add"></span>
+                        <span class="material-icons add" aria-hidden="true"></span>
                     </button>
                 </div>
                 <div class="taskTriggers"></div>
diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtask.js b/src/controllers/dashboard/scheduledtasks/scheduledtask.js
index db6847dcd3..bd11ed3ca6 100644
--- a/src/controllers/dashboard/scheduledtasks/scheduledtask.js
+++ b/src/controllers/dashboard/scheduledtasks/scheduledtask.js
@@ -57,7 +57,7 @@ import confirm from '../../../components/confirm/confirm';
                 const trigger = task.Triggers[i];
 
                 html += '<div class="listItem listItem-border">';
-                html += '<span class="material-icons listItemIcon schedule"></span>';
+                html += '<span class="material-icons listItemIcon schedule" aria-hidden="true"></span>';
                 if (trigger.MaxRuntimeMs) {
                     html += '<div class="listItemBody two-line">';
                 } else {
@@ -76,7 +76,7 @@ import confirm from '../../../components/confirm/confirm';
                 }
 
                 html += '</div>';
-                html += '<button class="btnDeleteTrigger" data-index="' + i + '" type="button" is="paper-icon-button-light" title="' + globalize.translate('Delete') + '"><span class="material-icons delete"></span></button>';
+                html += '<button class="btnDeleteTrigger" data-index="' + i + '" type="button" is="paper-icon-button-light" title="' + globalize.translate('Delete') + '"><span class="material-icons delete" aria-hidden="true"></span></button>';
                 html += '</div>';
             }
 
diff --git a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js
index a7139ca02e..4b16007706 100644
--- a/src/controllers/dashboard/scheduledtasks/scheduledtasks.js
+++ b/src/controllers/dashboard/scheduledtasks/scheduledtasks.js
@@ -49,7 +49,7 @@ import '../../../elements/emby-button/emby-button';
             }
             html += '<div class="listItem listItem-border scheduledTaskPaperIconItem" data-status="' + task.State + '">';
             html += "<a is='emby-linkbutton' style='margin:0;padding:0;' class='clearLink listItemIconContainer' href='scheduledtask.html?id=" + task.Id + "'>";
-            html += '<span class="material-icons listItemIcon schedule"></span>';
+            html += '<span class="material-icons listItemIcon schedule" aria-hidden="true"></span>';
             html += '</a>';
             html += '<div class="listItemBody two-line">';
             html += "<a class='clearLink' style='margin:0;padding:0;display:block;text-align:left;' is='emby-linkbutton' href='scheduledtask.html?id=" + task.Id + "'>";
@@ -58,9 +58,9 @@ import '../../../elements/emby-button/emby-button';
             html += '</a>';
             html += '</div>';
             if (task.State === 'Running') {
-                html += '<button type="button" is="paper-icon-button-light" id="btnTask' + task.Id + '" class="btnStopTask" data-taskid="' + task.Id + '" title="' + globalize.translate('ButtonStop') + '"><span class="material-icons stop"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" id="btnTask' + task.Id + '" class="btnStopTask" data-taskid="' + task.Id + '" title="' + globalize.translate('ButtonStop') + '"><span class="material-icons stop" aria-hidden="true"></span></button>';
             } else if (task.State === 'Idle') {
-                html += '<button type="button" is="paper-icon-button-light" id="btnTask' + task.Id + '" class="btnStartTask" data-taskid="' + task.Id + '" title="' + globalize.translate('ButtonStart') + '"><span class="material-icons play_arrow"></span></button>';
+                html += '<button type="button" is="paper-icon-button-light" id="btnTask' + task.Id + '" class="btnStartTask" data-taskid="' + task.Id + '" title="' + globalize.translate('ButtonStart') + '"><span class="material-icons play_arrow" aria-hidden="true"></span></button>';
             }
             html += '</div>';
         }
diff --git a/src/controllers/favorites.js b/src/controllers/favorites.js
index 45b6de4d8a..7bc27a1b81 100644
--- a/src/controllers/favorites.js
+++ b/src/controllers/favorites.js
@@ -246,7 +246,7 @@ import ServerConnections from '../components/ServerConnections';
                 html += '<h2 class="sectionTitle sectionTitle-cards">';
                 html += globalize.translate(section.name);
                 html += '</h2>';
-                html += '<span class="material-icons chevron_right"></span>';
+                html += '<span class="material-icons chevron_right" aria-hidden="true"></span>';
                 html += '</a>';
             }
 
diff --git a/src/controllers/itemDetails/index.html b/src/controllers/itemDetails/index.html
index 180f65cb8f..ac26454aeb 100644
--- a/src/controllers/itemDetails/index.html
+++ b/src/controllers/itemDetails/index.html
@@ -15,73 +15,73 @@
             <div class="mainDetailButtons focuscontainer-x">
                 <button is="emby-button" type="button" class="button-flat btnPlay hide detailButton raised" title="${ButtonResume}" data-action="resume">
                     <div class="detailButton-content">
-                        <span class="material-icons detailButton-icon play_arrow"></span>
+                        <span class="material-icons detailButton-icon play_arrow" aria-hidden="true"></span>
                     </div>
                 </button>
 
                 <button is="emby-button" type="button" class="button-flat btnReplay hide detailButton" title="${Play}" data-action="play">
                     <div class="detailButton-content">
-                        <span class="material-icons detailButton-icon replay"></span>
+                        <span class="material-icons detailButton-icon replay" aria-hidden="true"></span>
                     </div>
                 </button>
 
                 <button is="emby-button" type="button" class="button-flat btnDownload hide detailButton" title="${Download}">
                     <div class="detailButton-content">
-                        <span class="material-icons detailButton-icon get_app"></span>
+                        <span class="material-icons detailButton-icon get_app" aria-hidden="true"></span>
                     </div>
                 </button>
 
                 <button is="emby-button" type="button" class="button-flat btnPlayTrailer hide detailButton" title="${ButtonTrailer}">
                     <div class="detailButton-content">
-                        <span class="material-icons detailButton-icon theaters"></span>
+                        <span class="material-icons detailButton-icon theaters" aria-hidden="true"></span>
                     </div>
                 </button>
 
                 <button is="emby-button" type="button" class="button-flat btnInstantMix hide detailButton" title="${HeaderInstantMix}">
                     <div class="detailButton-content">
-                        <span class="material-icons detailButton-icon explore"></span>
+                        <span class="material-icons detailButton-icon explore" aria-hidden="true"></span>
                     </div>
                 </button>
 
                 <button is="emby-button" type="button" class="button-flat btnShuffle hide detailButton" title="${Shuffle}">
                     <div class="detailButton-content">
-                        <span class="material-icons detailButton-icon shuffle"></span>
+                        <span class="material-icons detailButton-icon shuffle" aria-hidden="true"></span>
                     </div>
                 </button>
 
                 <button is="emby-button" type="button" class="button-flat btnCancelSeriesTimer hide detailButton" title="${CancelSeries}">
                     <div class="detailButton-content">
-                        <span class="material-icons detailButton-icon delete"></span>
+                        <span class="material-icons detailButton-icon delete" aria-hidden="true"></span>
                     </div>
                 </button>
 
                 <button is="emby-button" type="button" class="button-flat btnCancelTimer hide detailButton" title="${StopRecording}">
                     <div class="detailButton-content">
-                        <span class="material-icons detailButton-icon stop"></span>
+                        <span class="material-icons detailButton-icon stop" aria-hidden="true"></span>
                     </div>
                 </button>
 
                 <button is="emby-playstatebutton" type="button" class="button-flat btnPlaystate hide detailButton" title="">
                     <div class="detailButton-content">
-                        <span class="material-icons detailButton-icon check"></span>
+                        <span class="material-icons detailButton-icon check" aria-hidden="true"></span>
                     </div>
                 </button>
 
                 <button is="emby-ratingbutton" type="button" class="button-flat btnUserRating hide detailButton" title="${Rate}">
                     <div class="detailButton-content">
-                        <span class="material-icons detailButton-icon favorite"></span>
+                        <span class="material-icons detailButton-icon favorite" aria-hidden="true"></span>
                     </div>
                 </button>
 
                 <button is="emby-button" type="button" class="button-flat btnSplitVersions hide detailButton" title="${ButtonSplit}">
                     <div class="detailButton-content">
-                        <span class="material-icons detailButton-icon call_split"></span>
+                        <span class="material-icons detailButton-icon call_split" aria-hidden="true"></span>
                     </div>
                 </button>
 
                 <button is="emby-button" type="button" class="button-flat btnMoreCommands hide detailButton" title="${ButtonMore}">
                     <div class="detailButton-content">
-                        <span class="material-icons detailButton-icon more_vert"></span>
+                        <span class="material-icons detailButton-icon more_vert" aria-hidden="true"></span>
                     </div>
                 </button>
             </div>
diff --git a/src/controllers/list.html b/src/controllers/list.html
index 1fb1d70e30..de250bc5d2 100644
--- a/src/controllers/list.html
+++ b/src/controllers/list.html
@@ -8,45 +8,45 @@
                 <span>${HeaderPlayAll}</span>
             </button>
             <button is="paper-icon-button-light" class="btnPlay listIconButton-autohide">
-                <span class="material-icons play_arrow"></span>
+                <span class="material-icons play_arrow" aria-hidden="true"></span>
             </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">
-                <span class="material-icons playlist_add"></span>
+                <span class="material-icons playlist_add" aria-hidden="true"></span>
             </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">
-                <span class="material-icons shuffle"></span>
+                <span class="material-icons shuffle" aria-hidden="true"></span>
             </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">
-                <span class="material-icons add"></span>
+                <span class="material-icons add" aria-hidden="true"></span>
             </button>
 
             <button is="emby-button" class="btnSort hide button-flat listTextButton-autohide">
                 <span class="btnSortText"></span>
-                <span class="material-icons btnSortIcon arrow_upward"></span>
+                <span class="material-icons btnSortIcon arrow_upward" aria-hidden="true"></span>
             </button>
             <button is="paper-icon-button-light" class="btnSort hide listIconButton-autohide">
-                <span class="material-icons sort"></span>
+                <span class="material-icons sort" aria-hidden="true"></span>
             </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;">
-                <span class="material-icons filter_list"></span>
+                <span class="material-icons filter_list" aria-hidden="true"></span>
             </button>
             <button is="emby-button" class="btnViewSettings button-flat listTextButton-autohide">
-                <span class="material-icons more_vert"></span>
+                <span class="material-icons more_vert" aria-hidden="true"></span>
             </button>
             <button is="paper-icon-button-light" class="btnViewSettings listIconButton-autohide">
-                <span class="material-icons more_vert"></span>
+                <span class="material-icons more_vert" aria-hidden="true"></span>
             </button>
         </div>
         <div is="emby-itemscontainer" class="vertical-wrap itemsContainer centered">
diff --git a/src/controllers/livetv.html b/src/controllers/livetv.html
index 2a484c6db0..47642eef1e 100644
--- a/src/controllers/livetv.html
+++ b/src/controllers/livetv.html
@@ -5,7 +5,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>
-                        <span class="material-icons chevron_right"></span>
+                        <span class="material-icons chevron_right" aria-hidden="true"></span>
                     </a>
                 </div>
                 <div is="emby-itemscontainer" class="activeProgramItems itemsContainer padded-left padded-right"></div>
@@ -14,7 +14,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;">${Shows}</h2>
-                        <span class="material-icons chevron_right"></span>
+                        <span class="material-icons chevron_right" aria-hidden="true"></span>
                     </a>
                 </div>
                 <div is="emby-itemscontainer" class="upcomingEpisodeItems itemsContainer padded-left padded-right"></div>
@@ -23,7 +23,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;">${Movies}</h2>
-                        <span class="material-icons chevron_right"></span>
+                        <span class="material-icons chevron_right" aria-hidden="true"></span>
                     </a>
                 </div>
                 <div is="emby-itemscontainer" class="upcomingTvMovieItems itemsContainer padded-left padded-right"></div>
@@ -32,7 +32,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>
-                        <span class="material-icons chevron_right"></span>
+                        <span class="material-icons chevron_right" aria-hidden="true"></span>
                     </a>
                 </div>
                 <div is="emby-itemscontainer" class="upcomingSportsItems itemsContainer padded-left padded-right"></div>
@@ -41,7 +41,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>
-                        <span class="material-icons chevron_right"></span>
+                        <span class="material-icons chevron_right" aria-hidden="true"></span>
                     </a>
                 </div>
                 <div is="emby-itemscontainer" class="upcomingKidsItems itemsContainer padded-left padded-right"></div>
@@ -50,7 +50,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>
-                        <span class="material-icons chevron_right"></span>
+                        <span class="material-icons chevron_right" aria-hidden="true"></span>
                     </a>
                 </div>
                 <div is="emby-itemscontainer" class="upcomingNewsItems itemsContainer padded-left padded-right"></div>
@@ -61,7 +61,7 @@
         <div class="pageTabContent" id="channelsTab" data-index="2">
             <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom focuscontainer-x">
                 <div class="paging"></div>
-                <button is="paper-icon-button-light" class="btnFilter sectionTitleButton" title="${Filter}"><span class="material-icons filter_list"></span></button>
+                <button is="paper-icon-button-light" class="btnFilter sectionTitleButton" title="${Filter}"><span class="material-icons filter_list" aria-hidden="true"></span></button>
             </div>
             <div is="emby-itemscontainer" id="items" class="itemsContainer vertical-wrap padded-left padded-right"></div>
             <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom focuscontainer-x">
@@ -73,7 +73,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>
-                        <span class="material-icons chevron_right"></span>
+                        <span class="material-icons chevron_right" aria-hidden="true"></span>
                     </button>
                 </div>
                 <div is="emby-itemscontainer" class="recordingItems itemsContainer padded-left padded-right"></div>
diff --git a/src/controllers/livetvsettings.html b/src/controllers/livetvsettings.html
index 374ab9a4a0..5fc7bd32ec 100644
--- a/src/controllers/livetvsettings.html
+++ b/src/controllers/livetvsettings.html
@@ -34,7 +34,7 @@
                         <div style="flex-grow:1;">
                             <input is="emby-input" id="txtRecordingPath" label="${LabelRecordingPath}" autocomplete="off" />
                         </div>
-                        <button type="button" is="paper-icon-button-light" id="btnSelectRecordingPath" title="${ButtonSelectDirectory}" class="emby-input-iconbutton"><span class="material-icons search"></span></button>
+                        <button type="button" is="paper-icon-button-light" id="btnSelectRecordingPath" title="${ButtonSelectDirectory}" class="emby-input-iconbutton"><span class="material-icons search" aria-hidden="true"></span></button>
                     </div>
                     <div class="fieldDescription">${LabelRecordingPathHelp}</div>
                 </div>
@@ -43,7 +43,7 @@
                         <div style="flex-grow:1;">
                             <input is="emby-input" id="txtMovieRecordingPath" label="${LabelMovieRecordingPath}" autocomplete="off" />
                         </div>
-                        <button type="button" is="paper-icon-button-light" id="btnSelectMovieRecordingPath" title="${ButtonSelectDirectory}" class="emby-input-iconbutton"><span class="material-icons search"></span></button>
+                        <button type="button" is="paper-icon-button-light" id="btnSelectMovieRecordingPath" title="${ButtonSelectDirectory}" class="emby-input-iconbutton"><span class="material-icons search" aria-hidden="true"></span></button>
                     </div>
                 </div>
                 <div class="inputContainer">
@@ -51,7 +51,7 @@
                         <div style="flex-grow:1;">
                             <input is="emby-input" id="txtSeriesRecordingPath" label="${LabelSeriesRecordingPath}" autocomplete="off" />
                         </div>
-                        <button type="button" is="paper-icon-button-light" id="btnSelectSeriesRecordingPath" title="${ButtonSelectDirectory}" class="emby-input-iconbutton"><span class="material-icons search"></span></button>
+                        <button type="button" is="paper-icon-button-light" id="btnSelectSeriesRecordingPath" title="${ButtonSelectDirectory}" class="emby-input-iconbutton"><span class="material-icons search" aria-hidden="true"></span></button>
                     </div>
                 </div>
                 <div class="verticalSection">
@@ -84,7 +84,7 @@
                             <div style="flex-grow:1;">
                                 <input is="emby-input" type="text" id="txtPostProcessor" label="${LabelPostProcessor}" />
                             </div>
-                            <button type="button" is="paper-icon-button-light" id="btnSelectPostProcessorPath" class="emby-input-iconbutton"><span class="material-icons search"></span></button>
+                            <button type="button" is="paper-icon-button-light" id="btnSelectPostProcessorPath" class="emby-input-iconbutton"><span class="material-icons search" aria-hidden="true"></span></button>
                         </div>
                     </div>
                     <div class="inputContainer">
diff --git a/src/controllers/livetvstatus.html b/src/controllers/livetvstatus.html
index 1a894bff94..a5cc476863 100644
--- a/src/controllers/livetvstatus.html
+++ b/src/controllers/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="${Add}">
-                            <span class="material-icons add"></span>
+                            <span class="material-icons add" aria-hidden="true"></span>
                         </button>
                         <a is="emby-linkbutton" rel="noopener noreferrer" style="margin-left:2em!important;" 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="${Add}">
-                            <span class="material-icons add"></span>
+                            <span class="material-icons add" aria-hidden="true"></span>
                         </button>
                     </div>
 
diff --git a/src/controllers/livetvstatus.js b/src/controllers/livetvstatus.js
index 7de9d3dca1..6e3a686c2f 100644
--- a/src/controllers/livetvstatus.js
+++ b/src/controllers/livetvstatus.js
@@ -38,11 +38,11 @@ function getDeviceHtml(device) {
     html += '<div class="cardScalable visualCardBox-cardScalable">';
     html += '<div class="' + padderClass + '"></div>';
     html += '<div class="cardContent searchImage">';
-    html += `<div class="cardImageContainer coveredImage ${cardBuilder.getDefaultBackgroundClass()}"><span class="cardImageIcon material-icons dvr"></span></div>`;
+    html += `<div class="cardImageContainer coveredImage ${cardBuilder.getDefaultBackgroundClass()}"><span class="cardImageIcon material-icons dvr" aria-hidden="true"></span></div>`;
     html += '</div>';
     html += '</div>';
     html += '<div class="cardFooter visualCardBox-cardFooter">';
-    html += '<button is="paper-icon-button-light" class="itemAction btnCardOptions autoSize" data-action="menu"><span class="material-icons more_vert"></span></button>';
+    html += '<button is="paper-icon-button-light" class="itemAction btnCardOptions autoSize" data-action="menu"><span class="material-icons more_vert" aria-hidden="true"></span></button>';
     html += '<div class="cardText">' + (device.FriendlyName || getTunerName(device.Type)) + '</div>';
     html += '<div class="cardText cardText-secondary">';
     html += device.Url || '&nbsp;';
@@ -110,7 +110,7 @@ function renderProviders(page, providers) {
         for (let i = 0, length = providers.length; i < length; i++) {
             const provider = providers[i];
             html += '<div class="listItem">';
-            html += '<span class="listItemIcon material-icons dvr"></span>';
+            html += '<span class="listItemIcon material-icons dvr" aria-hidden="true"></span>';
             html += '<div class="listItemBody two-line">';
             html += '<a is="emby-linkbutton" style="display:block;padding:0;margin:0;text-align:left;" class="clearLink" href="' + getProviderConfigurationUrl(provider.Type) + '&id=' + provider.Id + '">';
             html += '<h3 class="listItemBodyText">';
@@ -121,7 +121,7 @@ function renderProviders(page, providers) {
             html += '</div>';
             html += '</a>';
             html += '</div>';
-            html += '<button type="button" is="paper-icon-button-light" class="btnOptions" data-id="' + provider.Id + '"><span class="material-icons listItemAside more_vert"></span></button>';
+            html += '<button type="button" is="paper-icon-button-light" class="btnOptions" data-id="' + provider.Id + '"><span class="material-icons listItemAside more_vert" aria-hidden="true"></span></button>';
             html += '</div>';
         }
 
diff --git a/src/controllers/livetvtuner.html b/src/controllers/livetvtuner.html
index eab958c1c0..29940a9141 100644
--- a/src/controllers/livetvtuner.html
+++ b/src/controllers/livetvtuner.html
@@ -24,7 +24,7 @@
                         <div style="flex-grow: 1;">
                             <input is="emby-input" type="text" class="txtDevicePath" label="${LabelFileOrUrl}" required="required" autocomplete="off" />
                         </div>
-                        <button type="button" is="paper-icon-button-light" class="btnSelectPath hide emby-input-iconbutton"><span class="material-icons search"></span></button>
+                        <button type="button" is="paper-icon-button-light" class="btnSelectPath hide emby-input-iconbutton"><span class="material-icons search" aria-hidden="true"></span></button>
                     </div>
                 </div>
 
diff --git a/src/controllers/movies/moviegenres.js b/src/controllers/movies/moviegenres.js
index 524acfa01b..0bda9f3af4 100644
--- a/src/controllers/movies/moviegenres.js
+++ b/src/controllers/movies/moviegenres.js
@@ -152,7 +152,7 @@ import '../../elements/emby-button/emby-button';
                     html += '<h2 class="sectionTitle sectionTitle-cards">';
                     html += item.Name;
                     html += '</h2>';
-                    html += '<span class="material-icons hide chevron_right"></span>';
+                    html += '<span class="material-icons hide chevron_right" aria-hidden="true"></span>';
                     html += '</a>';
                     html += '</div>';
                     if (enableScrollX()) {
diff --git a/src/controllers/movies/movies.html b/src/controllers/movies/movies.html
index 87e9752679..def6bbeb94 100644
--- a/src/controllers/movies/movies.html
+++ b/src/controllers/movies/movies.html
@@ -3,9 +3,9 @@
     <div class="pageTabContent" id="moviesTab" data-index="0">
         <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom focuscontainer-x">
             <div class="paging"></div>
-            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy"></span></button>
-            <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha"></span></button>
-            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list"></span></button>
+            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy" aria-hidden="true"></span></button>
+            <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha" aria-hidden="true"></span></button>
+            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list" aria-hidden="true"></span></button>
         </div>
 
         <div class="alphaPicker alphaPicker-fixed alphaPicker-vertical">
@@ -46,8 +46,8 @@
     <div class="pageTabContent" id="trailersTab" data-index="2">
         <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom focuscontainer-x">
             <div class="paging"></div>
-            <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha"></span></button>
-            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list"></span></button>
+            <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha" aria-hidden="true"></span></button>
+            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list" aria-hidden="true"></span></button>
         </div>
 
         <div class="alphaPicker alphaPicker-fixed alphaPicker-fixed-right alphaPicker-vertical">
@@ -62,7 +62,7 @@
     <div class="pageTabContent" id="favoritesTab" data-index="3">
         <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom focuscontainer-x">
             <div class="paging"></div>
-            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy"></span></button>
+            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy" aria-hidden="true"></span></button>
         </div>
 
         <div is="emby-itemscontainer" class="itemsContainer padded-left padded-right">
@@ -74,9 +74,9 @@
     <div class="pageTabContent" id="collectionsTab" data-index="4">
         <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom focuscontainer-x">
             <div class="paging"></div>
-            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy"></span></button>
-            <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha"></span></button>
-            <button type="button" is="paper-icon-button-light" class="btnNewCollection autoSize"><span class="material-icons add"></span></button>
+            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy" aria-hidden="true"></span></button>
+            <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha" aria-hidden="true"></span></button>
+            <button type="button" is="paper-icon-button-light" class="btnNewCollection autoSize"><span class="material-icons add" aria-hidden="true"></span></button>
         </div>
 
         <div is="emby-itemscontainer" class="itemsContainer vertical-wrap centered padded-left padded-right" style="text-align:center;">
diff --git a/src/controllers/music/music.html b/src/controllers/music/music.html
index 141d940745..7096ce96fa 100644
--- a/src/controllers/music/music.html
+++ b/src/controllers/music/music.html
@@ -11,11 +11,11 @@
     <div class="pageTabContent" id="albumsTab" data-index="0">
         <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom focuscontainer-x">
             <div class="paging"></div>
-            <button is="paper-icon-button-light" class="btnPlayAll musicglobalButton" title="${HeaderPlayAll}"><span class="material-icons play_arrow"></span></button>
-            <button is="paper-icon-button-light" class="btnShuffle musicglobalButton" title="${Shuffle}"><span class="material-icons shuffle"></span></button>
-            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy"></span></button>
-            <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha"></span></button>
-            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list"></span></button>
+            <button is="paper-icon-button-light" class="btnPlayAll musicglobalButton" title="${HeaderPlayAll}"><span class="material-icons play_arrow" aria-hidden="true"></span></button>
+            <button is="paper-icon-button-light" class="btnShuffle musicglobalButton" title="${Shuffle}"><span class="material-icons shuffle" aria-hidden="true"></span></button>
+            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy" aria-hidden="true"></span></button>
+            <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha" aria-hidden="true"></span></button>
+            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list" aria-hidden="true"></span></button>
         </div>
 
         <div class="alphaPicker alphaPicker-fixed alphaPicker-vertical">
@@ -56,8 +56,8 @@
     <div class="pageTabContent" id="albumArtistsTab" data-index="2">
         <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom focuscontainer-x">
             <div class="paging"></div>
-            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy"></span></button>
-            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list"></span></button>
+            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy" aria-hidden="true"></span></button>
+            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list" aria-hidden="true"></span></button>
         </div>
 
         <div class="alphaPicker alphaPicker-fixed alphaPicker-vertical">
@@ -72,8 +72,8 @@
     <div class="pageTabContent" id="artistsTab" data-index="3">
         <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom focuscontainer-x">
             <div class="paging"></div>
-            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy"></span></button>
-            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list"></span></button>
+            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy" aria-hidden="true"></span></button>
+            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list" aria-hidden="true"></span></button>
         </div>
 
         <div class="alphaPicker alphaPicker-fixed alphaPicker-vertical">
@@ -92,8 +92,8 @@
     <div class="pageTabContent" id="songsTab" data-index="5">
         <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom focuscontainer-x">
             <div class="paging"></div>
-            <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha"></span></button>
-            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list"></span></button>
+            <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha" aria-hidden="true"></span></button>
+            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list" aria-hidden="true"></span></button>
         </div>
 
         <div is="emby-itemscontainer" id="items" class="itemsContainer vertical-list" style="max-width:67.5em;margin: 0 auto;"></div>
diff --git a/src/controllers/playback/queue/index.html b/src/controllers/playback/queue/index.html
index d946af4329..b5f5bf2cf6 100644
--- a/src/controllers/playback/queue/index.html
+++ b/src/controllers/playback/queue/index.html
@@ -32,35 +32,35 @@
 
                         <button is="paper-icon-button-light" class="btnCommand btnRepeat repeatToggleButton autoSize" title="${Repeat}"
                             data-command="SetRepeatMode">
-                            <span class="material-icons repeat"></span>
+                            <span class="material-icons repeat" aria-hidden="true"></span>
                         </button>
 
                         <button is="paper-icon-button-light" class="btnRewind btnNowPlayingRewind btnPlayStateCommand autoSize" title="${Rewind}">
-                            <span class="material-icons replay_10"></span>
+                            <span class="material-icons replay_10" aria-hidden="true"></span>
                         </button>
 
                         <button is="paper-icon-button-light" class="btnPreviousTrack btnPlayStateCommand autoSize" title="${ButtonPreviousTrack}">
-                            <span class="material-icons skip_previous"></span>
+                            <span class="material-icons skip_previous" aria-hidden="true"></span>
                         </button>
 
                         <button is="paper-icon-button-light" class="btnPlayPause btnPlayStateCommand autoSize" title="${ButtonPause}">
-                            <span class="material-icons pause_circle_filled"></span>
+                            <span class="material-icons pause_circle_filled" aria-hidden="true"></span>
                         </button>
 
                         <button is="paper-icon-button-light" class="btnPlayStateCommand btnStop autoSize" title="${ButtonStop}">
-                            <span class="material-icons stop"></span>
+                            <span class="material-icons stop" aria-hidden="true"></span>
                         </button>
 
                         <button is="paper-icon-button-light" class="btnPlayStateCommand btnNextTrack autoSize" title="${ButtonNextTrack}">
-                            <span class="material-icons skip_next"></span>
+                            <span class="material-icons skip_next" aria-hidden="true"></span>
                         </button>
 
                         <button is="paper-icon-button-light" class="btnPlayStateCommand btnFastForward btnNowPlayingFastForward autoSize" title="${FastForward}">
-                            <span class="material-icons forward_30"></span>
+                            <span class="material-icons forward_30" aria-hidden="true"></span>
                         </button>
 
                         <button is="paper-icon-button-light" class="btnShuffleQueue autoSize" title="${Shuffle}">
-                            <span class="material-icons shuffle"></span>
+                            <span class="material-icons shuffle" aria-hidden="true"></span>
                         </button>
 
                     </div>
@@ -68,26 +68,26 @@
                     <div class="nowPlayingSecondaryButtons">
 
                         <button is="paper-icon-button-light" class="btnAudioTracks videoButton btnPlayStateCommand autoSize" title="${ButtonAudioTracks}" data-command="GoToSearch">
-                            <span class="material-icons audiotrack"></span>
+                            <span class="material-icons audiotrack" aria-hidden="true"></span>
                         </button>
 
                         <button is="paper-icon-button-light" class="btnSubtitles videoButton btnPlayStateCommand autoSize" title="${Subtitles}" data-command="GoToSearch">
-                            <span class="material-icons closed_caption"></span>
+                            <span class="material-icons closed_caption" aria-hidden="true"></span>
                         </button>
 
                         <div class="nowPlayingPageUserDataButtons"></div>
 
                         <button is="paper-icon-button-light" class="btnToggleFullscreen videoButton btnPlayStateCommand autoSize" title="${ButtonFullscreen}" data-command="ToggleFullscreen">
-                            <span class="material-icons fullscreen"></span>
+                            <span class="material-icons fullscreen" aria-hidden="true"></span>
                         </button>
 
                         <button is="paper-icon-button-light" class="btnShuffleQueue autoSize" title="${Shuffle}">
-                            <span class="material-icons shuffle"></span>
+                            <span class="material-icons shuffle" aria-hidden="true"></span>
                         </button>
 
                         <button is="paper-icon-button-light" class="btnCommand btnRepeat repeatToggleButton autoSize" title="${Repeat}"
                             data-command="SetRepeatMode">
-                            <span class="material-icons repeat"></span>
+                            <span class="material-icons repeat" aria-hidden="true"></span>
                         </button>
 
                     </div>
@@ -100,43 +100,43 @@
                     <div class="collapseContent">
                         <div>
                             <button is="paper-icon-button-light" class="btnArrowUp btnCommand autoSize button-submit" title="${Up}" data-command="MoveUp">
-                                <span class="material-icons keyboard_arrow_up"></span>
+                                <span class="material-icons keyboard_arrow_up" aria-hidden="true"></span>
                             </button>
                         </div>
                         <br />
                         <div>
                             <button is="paper-icon-button-light" class="btnArrowLeft btnCommand autoSize button-submit" title="${ButtonArrowLeft}" data-command="MoveLeft">
-                                <span class="material-icons keyboard_arrow_left"></span>
+                                <span class="material-icons keyboard_arrow_left" aria-hidden="true"></span>
                             </button>
                             <button is="paper-icon-button-light" class="btnOk btnCommand autoSize button-submit" title="${ButtonOk}" data-command="Select">
-                                <span class="material-icons keyboard_return"></span>
+                                <span class="material-icons keyboard_return" aria-hidden="true"></span>
                             </button>
                             <button is="paper-icon-button-light" class="btnArrowRight btnCommand autoSize button-submit" title="${ButtonArrowRight}" data-command="MoveRight">
-                                <span class="material-icons keyboard_arrow_right"></span>
+                                <span class="material-icons keyboard_arrow_right" aria-hidden="true"></span>
                             </button>
                         </div>
                         <br />
                         <div>
                             <button is="paper-icon-button-light" class="btnBack btnCommand autoSize" title="${ButtonBack}" data-command="Back">
-                                <span class="material-icons arrow_back"></span>
+                                <span class="material-icons arrow_back" aria-hidden="true"></span>
                             </button>
                             <button is="paper-icon-button-light" class="btnArrowDown btnCommand autoSize button-submit" title="${Down}" data-command="MoveDown">
-                                <span class="material-icons keyboard_arrow_down"></span>
+                                <span class="material-icons keyboard_arrow_down" aria-hidden="true"></span>
                             </button>
                             <button is="paper-icon-button-light" class="btnContextMenu btnCommand autoSize" title="${ButtonInfo}" data-command="ToggleContextMenu">
-                                <span class="material-icons menu"></span>
+                                <span class="material-icons menu" aria-hidden="true"></span>
                             </button>
                         </div>
                         <br />
                         <div>
                             <button is="paper-icon-button-light" class="btnGoHome btnCommand autoSize" title="${Home}" data-command="GoHome">
-                                <span class="material-icons home"></span>
+                                <span class="material-icons home" aria-hidden="true"></span>
                             </button>
                             <button is="paper-icon-button-light" class="btnShowSearch btnCommand autoSize" title="${Search}" data-command="GoToSearch">
-                                <span class="material-icons search"></span>
+                                <span class="material-icons search" aria-hidden="true"></span>
                             </button>
                             <button is="paper-icon-button-light" class="bthShowSettings btnCommand autoSize" title="${Settings}" data-command="GoToSettings">
-                                <span class="material-icons settings"></span>
+                                <span class="material-icons settings" aria-hidden="true"></span>
                             </button>
                         </div>
                     </div>
@@ -178,13 +178,13 @@
         <div class="playlistSection">
             <div class="playlistSectionButton flex align-items-center justify-content-center focuscontainer-x">
                 <button id="togglePlaylist" is="paper-icon-button-light" class="btnTogglePlaylist hide" title="${ButtonTogglePlaylist}">
-                    <span class="material-icons queue_music"></span>
+                    <span class="material-icons queue_music" aria-hidden="true"></span>
                 </button>
                 <button is="paper-icon-button-light" class="btnSavePlaylist hide" title="${Save}">
-                    <span class="material-icons save"></span>
+                    <span class="material-icons save" aria-hidden="true"></span>
                 </button>
                 <button id="toggleContextMenu" is="paper-icon-button-light" class="btnToggleContextMenu" title="${ButtonMore}">
-                    <span class="material-icons more_vert"></span>
+                    <span class="material-icons more_vert" aria-hidden="true"></span>
                 </button>
             </div>
             <div id="playlist" class="playlist itemsContainer vertical-list nowPlayingPlaylist hide" is="emby-itemscontainer" data-dragreorder="true"></div>
diff --git a/src/controllers/playback/video/index.html b/src/controllers/playback/video/index.html
index 55b6271cc7..54f8f87118 100644
--- a/src/controllers/playback/video/index.html
+++ b/src/controllers/playback/video/index.html
@@ -1,8 +1,8 @@
 <div id="videoOsdPage" data-role="page" class="page libraryPage" data-backbutton="true">
     <div class="syncPlayContainer">
         <div id="syncPlayIcon" class="syncPlayIconCircle">
-            <span class="primary-icon material-icons play"></span>
-            <span class="secondary-icon material-icons play"></span>
+            <span class="primary-icon material-icons play" aria-hidden="true"></span>
+            <span class="secondary-icon material-icons play" aria-hidden="true"></span>
         </div>
     </div>
     <div class="upNextContainer hide"></div>
@@ -11,7 +11,7 @@
             <div class="osdTextContainer osdMainTextContainer">
                 <h3 class="osdTitle"></h3>
                 <div class="osdMediaStatus hide">
-                    <span class="material-icons animate autorenew"></span>
+                    <span class="material-icons animate autorenew" aria-hidden="true"></span>
                     <span>${FetchingData}</span>
                 </div>
             </div>
@@ -28,35 +28,35 @@
 
             <div class="buttons focuscontainer-x">
                 <button is="paper-icon-button-light" class="btnRecord autoSize hide">
-                    <span class="xlargePaperIconButton material-icons fiber_manual_record"></span>
+                    <span class="xlargePaperIconButton material-icons fiber_manual_record" aria-hidden="true"></span>
                 </button>
 
                 <button is="paper-icon-button-light" class="btnPreviousTrack autoSize hide" title="${PreviousTrack}">
-                    <span class="xlargePaperIconButton material-icons skip_previous"></span>
+                    <span class="xlargePaperIconButton material-icons skip_previous" aria-hidden="true"></span>
                 </button>
 
                 <button is="paper-icon-button-light" class="btnPreviousChapter autoSize hide" title="${PreviousChapter}">
-                    <span class="xlargePaperIconButton material-icons undo"></span>
+                    <span class="xlargePaperIconButton material-icons undo" aria-hidden="true"></span>
                 </button>
 
-                <button is="paper-icon-button-light" class="btnRewind" title="${Rewind} (j)">
-                    <span class="xlargePaperIconButton material-icons fast_rewind"></span>
+                <button is="paper-icon-button-light" class="btnRewind" title="${Rewind} (j)" aria-label="${Rewind}">
+                    <span class="xlargePaperIconButton material-icons fast_rewind" aria-hidden="true"></span>
                 </button>
 
                 <button is="paper-icon-button-light" class="btnPause autoSize">
-                    <span class="xlargePaperIconButton material-icons pause"></span>
+                    <span class="xlargePaperIconButton material-icons pause" aria-hidden="true"></span>
                 </button>
 
                 <button is="paper-icon-button-light" class="btnFastForward" title="${FastForward} (l)">
-                    <span class="xlargePaperIconButton material-icons fast_forward"></span>
+                    <span class="xlargePaperIconButton material-icons fast_forward" aria-hidden="true"></span>
                 </button>
 
                 <button is="paper-icon-button-light" class="btnNextChapter autoSize hide" title="${NextChapter}">
-                    <span class="xlargePaperIconButton material-icons redo"></span>
+                    <span class="xlargePaperIconButton material-icons redo" aria-hidden="true"></span>
                 </button>
 
                 <button is="paper-icon-button-light" class="btnNextTrack autoSize hide" title="${NextTrack}">
-                    <span class="xlargePaperIconButton material-icons skip_next"></span>
+                    <span class="xlargePaperIconButton material-icons skip_next" aria-hidden="true"></span>
                 </button>
 
                 <div class="osdTimeText">
@@ -64,30 +64,30 @@
                 </div>
 
                 <button is="paper-icon-button-light" class="btnSubtitles hide autoSize" title="${Subtitles}">
-                    <span class="xlargePaperIconButton material-icons closed_caption"></span>
+                    <span class="xlargePaperIconButton material-icons closed_caption" aria-hidden="true"></span>
                 </button>
                 <button is="paper-icon-button-light" class="btnAudio hide autoSize" title="${Audio}">
-                    <span class="xlargePaperIconButton material-icons audiotrack"></span>
+                    <span class="xlargePaperIconButton material-icons audiotrack" aria-hidden="true"></span>
                 </button>
                 <div class="volumeButtons hide-mouse-idle-tv">
                     <button is="paper-icon-button-light" class="buttonMute autoSize" title="${Mute} (m)">
-                        <span class="xlargePaperIconButton material-icons volume_up"></span>
+                        <span class="xlargePaperIconButton material-icons volume_up" aria-hidden="true"></span>
                     </button>
                     <div class="sliderContainer osdVolumeSliderContainer">
                         <input is="emby-slider" type="range" step="1" min="0" max="100" value="0" class="osdVolumeSlider" />
                     </div>
                 </div>
                 <button is="paper-icon-button-light" class="btnVideoOsdSettings hide autoSize" title="${Settings}">
-                    <span class="largePaperIconButton material-icons settings"></span>
+                    <span class="largePaperIconButton material-icons settings" aria-hidden="true"></span>
                 </button>
                 <button is="paper-icon-button-light" class="btnAirPlay hide autoSize" title="${AirPlay}">
-                    <span class="xlargePaperIconButton material-icons airplay"></span>
+                    <span class="xlargePaperIconButton material-icons airplay" aria-hidden="true"></span>
                 </button>
                 <button is="paper-icon-button-light" class="btnPip hide autoSize" title="${PictureInPicture}">
-                    <span class="xlargePaperIconButton material-icons picture_in_picture_alt"></span>
+                    <span class="xlargePaperIconButton material-icons picture_in_picture_alt" aria-hidden="true"></span>
                 </button>
                 <button is="paper-icon-button-light" class="btnFullscreen hide autoSize" title="${Fullscreen} (f)">
-                    <span class="xlargePaperIconButton material-icons fullscreen"></span>
+                    <span class="xlargePaperIconButton material-icons fullscreen" aria-hidden="true"></span>
                 </button>
             </div>
         </div>
diff --git a/src/controllers/session/login/index.js b/src/controllers/session/login/index.js
index 9aecc0f545..b863a5f550 100644
--- a/src/controllers/session/login/index.js
+++ b/src/controllers/session/login/index.js
@@ -169,7 +169,7 @@ import './login.scss';
                 html += '<div class="cardImageContainer coveredImage" style="background-image:url(\'' + imgUrl + "');\"></div>";
             } else {
                 html += `<div class="cardImage flex align-items-center justify-content-center ${cardBuilder.getDefaultBackgroundClass()}">`;
-                html += '<span class="material-icons cardImageIcon person"></span>';
+                html += '<span class="material-icons cardImageIcon person" aria-hidden="true"></span>';
                 html += '</div>';
             }
 
diff --git a/src/controllers/session/selectServer/index.js b/src/controllers/session/selectServer/index.js
index 9ee0000b84..632267558c 100644
--- a/src/controllers/session/selectServer/index.js
+++ b/src/controllers/session/selectServer/index.js
@@ -38,7 +38,7 @@ import cardBuilder from '../../../components/cardbuilder/cardBuilder';
             let cardImageContainer;
 
             if (item.showIcon) {
-                cardImageContainer = '<span class="cardImageIcon material-icons ' + item.icon + '"></span>';
+                cardImageContainer = '<span class="cardImageIcon material-icons ' + item.icon + '" aria-hidden="true"></span>';
             } else {
                 cardImageContainer = '<div class="cardImage" style="' + item.cardImageStyle + '"></div>';
             }
diff --git a/src/controllers/shows/tvgenres.js b/src/controllers/shows/tvgenres.js
index b35686f289..a14d25344a 100644
--- a/src/controllers/shows/tvgenres.js
+++ b/src/controllers/shows/tvgenres.js
@@ -150,7 +150,7 @@ import '../../elements/emby-button/emby-button';
                     html += '<h2 class="sectionTitle sectionTitle-cards">';
                     html += item.Name;
                     html += '</h2>';
-                    html += '<span class="material-icons hide chevron_right"></span>';
+                    html += '<span class="material-icons hide chevron_right" aria-hidden="true"></span>';
                     html += '</a>';
                     html += '</div>';
                     if (enableScrollX()) {
diff --git a/src/controllers/shows/tvrecommended.html b/src/controllers/shows/tvrecommended.html
index 1a7628a6c4..a46d72ae9c 100644
--- a/src/controllers/shows/tvrecommended.html
+++ b/src/controllers/shows/tvrecommended.html
@@ -3,9 +3,9 @@
     <div class="pageTabContent" id="seriesTab" data-index="0">
         <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom focuscontainer-x">
             <div class="paging"></div>
-            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy"></span></button>
-            <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha"></span></button>
-            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list"></span></button>
+            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy" aria-hidden="true"></span></button>
+            <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha" aria-hidden="true"></span></button>
+            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list" aria-hidden="true"></span></button>
         </div>
 
         <div is="emby-itemscontainer" class="itemsContainer padded-left padded-right"></div>
@@ -57,9 +57,9 @@
     <div class="pageTabContent" id="episodesTab" data-index="5">
         <div class="flex align-items-center justify-content-center flex-wrap-wrap padded-top padded-left padded-right padded-bottom focuscontainer-x">
             <div class="paging"></div>
-            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy"></span></button>
-            <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha"></span></button>
-            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list"></span></button>
+            <button is="paper-icon-button-light" class="btnSelectView autoSize" title="${ButtonSelectView}"><span class="material-icons view_comfy" aria-hidden="true"></span></button>
+            <button is="paper-icon-button-light" class="btnSort autoSize" title="${Sort}"><span class="material-icons sort_by_alpha" aria-hidden="true"></span></button>
+            <button is="paper-icon-button-light" class="btnFilter autoSize" title="${Filter}"><span class="material-icons filter_list" aria-hidden="true"></span></button>
         </div>
         <div is="emby-itemscontainer" class="itemsContainer vertical-wrap padded-left padded-right">
         </div>
diff --git a/src/controllers/user/menu/index.html b/src/controllers/user/menu/index.html
index 66a07f2a14..9b3b588e76 100644
--- a/src/controllers/user/menu/index.html
+++ b/src/controllers/user/menu/index.html
@@ -5,7 +5,7 @@
                 <h2 class="sectionTitle headerUsername" style="padding-left:.25em;"></h2>
                 <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkMyProfile listItem-border">
                     <div class="listItem">
-                        <span class="material-icons listItemIcon listItemIcon-transparent person"></span>
+                        <span class="material-icons listItemIcon listItemIcon-transparent person" aria-hidden="true"></span>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${Profile}</div>
                         </div>
@@ -14,7 +14,7 @@
 
                 <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkQuickConnectPreferences listItem-border hide">
                     <div class="listItem">
-                        <em class="material-icons listItemIcon listItemIcon-transparent">tap_and_play</em>
+                        <span class="material-icons listItemIcon listItemIcon-transparent tap_and_play" aria-hidden="true"></span>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${QuickConnect}</div>
                         </div>
@@ -23,7 +23,7 @@
 
                 <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkDisplayPreferences listItem-border">
                     <div class="listItem">
-                        <span class="material-icons listItemIcon listItemIcon-transparent tv"></span>
+                        <span class="material-icons listItemIcon listItemIcon-transparent tv" aria-hidden="true"></span>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${Display}</div>
                         </div>
@@ -32,7 +32,7 @@
 
                 <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkHomePreferences listItem-border">
                     <div class="listItem">
-                        <span class="material-icons listItemIcon listItemIcon-transparent home"></span>
+                        <span class="material-icons listItemIcon listItemIcon-transparent home" aria-hidden="true"></span>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${Home}</div>
                         </div>
@@ -41,7 +41,7 @@
 
                 <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkPlaybackPreferences listItem-border">
                     <div class="listItem">
-                        <span class="material-icons listItemIcon listItemIcon-transparent play_circle_filled"></span>
+                        <span class="material-icons listItemIcon listItemIcon-transparent play_circle_filled" aria-hidden="true"></span>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${TitlePlayback}</div>
                         </div>
@@ -50,7 +50,7 @@
 
                 <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkSubtitlePreferences listItem-border">
                     <div class="listItem">
-                        <span class="material-icons listItemIcon listItemIcon-transparent closed_caption"></span>
+                        <span class="material-icons listItemIcon listItemIcon-transparent closed_caption" aria-hidden="true"></span>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${Subtitles}</div>
                         </div>
@@ -59,7 +59,7 @@
 
                 <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="clientSettings listItem-border">
                     <div class="listItem">
-                        <span class="material-icons listItemIcon listItemIcon-transparent devices_other"></span>
+                        <span class="material-icons listItemIcon listItemIcon-transparent devices_other" aria-hidden="true"></span>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${ClientSettings}</div>
                         </div>
@@ -68,7 +68,7 @@
 
                 <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkControlsPreferences listItem-border">
                     <div class="listItem">
-                        <span class="material-icons listItemIcon listItemIcon-transparent keyboard"></span>
+                        <span class="material-icons listItemIcon listItemIcon-transparent keyboard" aria-hidden="true"></span>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${Controls}</div>
                         </div>
@@ -79,7 +79,7 @@
                 <h2 class="sectionTitle" style="padding-left:.25em;">${HeaderAdmin}</h2>
                 <a is="emby-linkbutton" href="#!/dashboard.html" style="display:block;padding:0;margin:0;" class="listItem-border">
                     <div class="listItem">
-                        <span class="material-icons listItemIcon listItemIcon-transparent dashboard"></span>
+                        <span class="material-icons listItemIcon listItemIcon-transparent dashboard" aria-hidden="true"></span>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${TabDashboard}</div>
                         </div>
@@ -87,7 +87,7 @@
                 </a>
                 <a is="emby-linkbutton" href="#!/edititemmetadata.html" style="display:block;padding:0;margin:0;" class="listItem-border">
                     <div class="listItem">
-                        <span class="material-icons listItemIcon listItemIcon-transparent mode_edit"></span>
+                        <span class="material-icons listItemIcon listItemIcon-transparent mode_edit" aria-hidden="true"></span>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${Metadata}</div>
                         </div>
@@ -98,7 +98,7 @@
                 <h2 class="sectionTitle" style="padding-left:.25em;">${HeaderUser}</h2>
                 <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="selectServer hide listItem-border">
                     <div class="listItem">
-                        <span class="material-icons listItemIcon listItemIcon-transparent wifi"></span>
+                        <span class="material-icons listItemIcon listItemIcon-transparent wifi" aria-hidden="true"></span>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${SelectServer}</div>
                         </div>
@@ -106,7 +106,7 @@
                 </a>
                 <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="btnLogout listItem-border">
                     <div class="listItem">
-                        <span class="material-icons listItemIcon listItemIcon-transparent exit_to_app"></span>
+                        <span class="material-icons listItemIcon listItemIcon-transparent exit_to_app" aria-hidden="true"></span>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${ButtonSignOut}</div>
                         </div>
@@ -115,7 +115,7 @@
 
                 <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="exitApp listItem-border">
                     <div class="listItem">
-                        <span class="material-icons listItemIcon listItemIcon-transparent close"></span>
+                        <span class="material-icons listItemIcon listItemIcon-transparent close" aria-hidden="true"></span>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${ButtonExitApp}</div>
                         </div>
diff --git a/src/controllers/wizard/finish/index.html b/src/controllers/wizard/finish/index.html
index 3447ced02f..66ee9a109c 100644
--- a/src/controllers/wizard/finish/index.html
+++ b/src/controllers/wizard/finish/index.html
@@ -5,11 +5,11 @@
             <p style="margin:2em 0;">${WizardCompleted}</p>
             <div class="wizardNavigation">
                 <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();">
-                    <span class="material-icons arrow_back"></span>
+                    <span class="material-icons arrow_back" aria-hidden="true"></span>
                     <span>${Previous}</span>
                 </button>
                 <button is="emby-button" type="button" class="raised btnWizardNext button-submit">
-                    <span class="material-icons check"></span>
+                    <span class="material-icons check" aria-hidden="true"></span>
                     <span>${LabelFinish}</span>
                 </button>
             </div>
diff --git a/src/controllers/wizard/library.html b/src/controllers/wizard/library.html
index f43cb534eb..79c551c32f 100644
--- a/src/controllers/wizard/library.html
+++ b/src/controllers/wizard/library.html
@@ -3,7 +3,7 @@
         <div class="ui-corner-all ui-shadow wizardContent">
             <div>
                 <h1 style="display:inline-block;">${HeaderSetupLibrary}</h1>
-                <a href="https://docs.jellyfin.org/general/server/libraries.html" rel="noopener noreferrer" target="_blank" class="clearLink" style="margin-top:-10px;display:inline-block;vertical-align:middle;margin-left:2em;"><button is="emby-button" type="button" class="raised"><span class="material-icons info"></span><span>${Help}</span></button></a>
+                <a href="https://docs.jellyfin.org/general/server/libraries.html" rel="noopener noreferrer" target="_blank" class="clearLink" style="margin-top:-10px;display:inline-block;vertical-align:middle;margin-left:2em;"><button is="emby-button" type="button" class="raised"><span class="material-icons info" aria-hidden="true"></span><span>${Help}</span></button></a>
             </div>
             <br />
             <div id="divVirtualFolders"></div>
@@ -11,12 +11,12 @@
             <br />
             <div class="wizardNavigation">
                 <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();">
-                    <span class="material-icons arrow_back"></span>
+                    <span class="material-icons arrow_back" aria-hidden="true"></span>
                     <span>${Previous}</span>
                 </button>
                 <button is="emby-button" type="button" class="raised button-submit" onclick="WizardLibraryPage.next();">
                     <span>${Next}</span>
-                    <span class="material-icons arrow_forward"></span>
+                    <span class="material-icons arrow_forward" aria-hidden="true"></span>
                 </button>
             </div>
         </div>
diff --git a/src/controllers/wizard/remote/index.html b/src/controllers/wizard/remote/index.html
index 0334f584c5..05070e13c8 100644
--- a/src/controllers/wizard/remote/index.html
+++ b/src/controllers/wizard/remote/index.html
@@ -21,12 +21,12 @@
                 <br />
                 <div class="wizardNavigation">
                     <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();">
-                        <span class="material-icons arrow_back"></span>
+                        <span class="material-icons arrow_back" aria-hidden="true"></span>
                         <span>${Previous}</span>
                     </button>
                     <button is="emby-button" type="submit" class="raised button-submit">
                         <span>${Next}</span>
-                        <span class="material-icons arrow_forward"></span>
+                        <span class="material-icons arrow_forward" aria-hidden="true"></span>
                     </button>
                 </div>
             </form>
diff --git a/src/controllers/wizard/settings/index.html b/src/controllers/wizard/settings/index.html
index d1f557d8f1..52b44376eb 100644
--- a/src/controllers/wizard/settings/index.html
+++ b/src/controllers/wizard/settings/index.html
@@ -16,12 +16,12 @@
 
                 <div class="wizardNavigation">
                     <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();">
-                        <span class="material-icons arrow_back"></span>
+                        <span class="material-icons arrow_back" aria-hidden="true"></span>
                         <span>${Previous}</span>
                     </button>
                     <button is="emby-button" type="submit" class="raised button-submit">
                         <span>${Next}</span>
-                        <span class="material-icons arrow_forward"></span>
+                        <span class="material-icons arrow_forward" aria-hidden="true"></span>
                     </button>
                 </div>
             </form>
diff --git a/src/controllers/wizard/start/index.html b/src/controllers/wizard/start/index.html
index 5306d2ca73..5a8cb90c9c 100644
--- a/src/controllers/wizard/start/index.html
+++ b/src/controllers/wizard/start/index.html
@@ -20,7 +20,7 @@
                 <div class="wizardNavigation" style="text-align:right;">
                     <button is="emby-button" type="submit" class="raised button-submit">
                         <span>${Next}</span>
-                        <span class="material-icons arrow_forward"></span>
+                        <span class="material-icons arrow_forward" aria-hidden="true"></span>
                     </button>
                 </div>
             </form>
diff --git a/src/controllers/wizard/user/index.html b/src/controllers/wizard/user/index.html
index 24429d043a..785c9d8945 100644
--- a/src/controllers/wizard/user/index.html
+++ b/src/controllers/wizard/user/index.html
@@ -22,12 +22,12 @@
 
                 <div class="wizardNavigation">
                     <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();">
-                        <span class="material-icons arrow_back"></span>
+                        <span class="material-icons arrow_back" aria-hidden="true"></span>
                         <span>${Previous}</span>
                     </button>
                     <button is="emby-button" type="submit" class="raised button-submit">
                         <span>${Next}</span>
-                        <span class="material-icons arrow_forward"></span>
+                        <span class="material-icons arrow_forward" aria-hidden="true"></span>
                     </button>
                 </div>
             </form>
diff --git a/src/elements/emby-checkbox/emby-checkbox.js b/src/elements/emby-checkbox/emby-checkbox.js
index ef21ff8136..1923ef4e5c 100644
--- a/src/elements/emby-checkbox/emby-checkbox.js
+++ b/src/elements/emby-checkbox/emby-checkbox.js
@@ -61,8 +61,8 @@ import 'webcomponents.js/webcomponents-lite';
 
         const checkedIcon = this.getAttribute('data-checkedicon') || 'check';
         const uncheckedIcon = this.getAttribute('data-uncheckedicon') || '';
-        const checkHtml = '<span class="material-icons checkboxIcon checkboxIcon-checked ' + checkedIcon + '"></span>';
-        const uncheckedHtml = '<span class="material-icons checkboxIcon checkboxIcon-unchecked ' + uncheckedIcon + '"></span>';
+        const checkHtml = '<span class="material-icons checkboxIcon checkboxIcon-checked ' + checkedIcon + '" aria-hidden="true"></span>';
+        const uncheckedHtml = '<span class="material-icons checkboxIcon checkboxIcon-unchecked ' + uncheckedIcon + '" aria-hidden="true"></span>';
         labelElement.insertAdjacentHTML('beforeend', '<span class="' + outlineClass + '">' + checkHtml + uncheckedHtml + '</span>');
 
         labelTextElement.classList.add('checkboxLabel');
diff --git a/src/elements/emby-collapse/emby-collapse.js b/src/elements/emby-collapse/emby-collapse.js
index c4dfeeb5af..bd9743c55b 100644
--- a/src/elements/emby-collapse/emby-collapse.js
+++ b/src/elements/emby-collapse/emby-collapse.js
@@ -81,7 +81,7 @@ import '../emby-button/emby-button';
 
         const title = this.getAttribute('title');
 
-        const html = '<button is="emby-button" type="button" on-click="toggleExpand" id="expandButton" class="emby-collapsible-button iconRight"><h3 class="emby-collapsible-title" title="' + title + '">' + title + '</h3><span class="material-icons emby-collapse-expandIcon expand_more"></span></button>';
+        const html = '<button is="emby-button" type="button" on-click="toggleExpand" id="expandButton" class="emby-collapsible-button iconRight"><h3 class="emby-collapsible-title" title="' + title + '">' + title + '</h3><span class="material-icons emby-collapse-expandIcon expand_more" aria-hidden="true"></span></button>';
 
         this.insertAdjacentHTML('afterbegin', html);
 
diff --git a/src/elements/emby-scrollbuttons/emby-scrollbuttons.js b/src/elements/emby-scrollbuttons/emby-scrollbuttons.js
index d1cb4705bc..b484733aea 100644
--- a/src/elements/emby-scrollbuttons/emby-scrollbuttons.js
+++ b/src/elements/emby-scrollbuttons/emby-scrollbuttons.js
@@ -13,7 +13,7 @@ const EmbyScrollButtonsPrototype = Object.create(HTMLDivElement.prototype);
         const 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 += '<span class="material-icons ' + icon + '"></span>';
+        html += '<span class="material-icons ' + icon + '" aria-hidden="true"></span>';
         html += '</button>';
 
         return html;
diff --git a/src/elements/emby-select/emby-select.js b/src/elements/emby-select/emby-select.js
index d73277a89d..d1057a86ed 100644
--- a/src/elements/emby-select/emby-select.js
+++ b/src/elements/emby-select/emby-select.js
@@ -141,7 +141,7 @@ import 'webcomponents.js/webcomponents-lite';
         this.parentNode?.insertBefore(label, this);
 
         if (this.classList.contains('emby-select-withcolor')) {
-            this.parentNode?.insertAdjacentHTML('beforeend', '<div class="selectArrowContainer"><div style="visibility:hidden;display:none;">0</div><span class="selectArrow material-icons keyboard_arrow_down"></span></div>');
+            this.parentNode?.insertAdjacentHTML('beforeend', '<div class="selectArrowContainer"><div style="visibility:hidden;display:none;">0</div><span class="selectArrow material-icons keyboard_arrow_down" aria-hidden="true"></span></div>');
         }
     };
 
diff --git a/src/plugins/bookPlayer/tableOfContents.js b/src/plugins/bookPlayer/tableOfContents.js
index db498c10fd..7736891e02 100644
--- a/src/plugins/bookPlayer/tableOfContents.js
+++ b/src/plugins/bookPlayer/tableOfContents.js
@@ -63,7 +63,7 @@ export default class TableOfContents {
         elem.id = 'dialogToc';
 
         let tocHtml = '<div class="topRightActionButtons">';
-        tocHtml += '<button is="paper-icon-button-light" class="autoSize bookplayerButton btnBookplayerTocClose hide-mouse-idle-tv" tabindex="-1"><span class="material-icons bookplayerButtonIcon close"></span></button>';
+        tocHtml += '<button is="paper-icon-button-light" class="autoSize bookplayerButton btnBookplayerTocClose hide-mouse-idle-tv" tabindex="-1"><span class="material-icons bookplayerButtonIcon close" aria-hidden="true"></span></button>';
         tocHtml += '</div>';
         tocHtml += '<ul class="toc">';
         rendition.book.navigation.forEach((chapter) => {
diff --git a/src/plugins/bookPlayer/template.html b/src/plugins/bookPlayer/template.html
index 73089db44f..bf71834f02 100644
--- a/src/plugins/bookPlayer/template.html
+++ b/src/plugins/bookPlayer/template.html
@@ -1,18 +1,18 @@
 <div class="topButtons">
     <button is="paper-icon-button-light" id="btnBookplayerToc" class="autoSize bookplayerButton hide-mouse-idle-tv" tabindex="-1">
-        <span class="material-icons bookplayerButtonIcon toc"></span>
+        <span class="material-icons bookplayerButtonIcon toc" aria-hidden="true"></span>
     </button>
     <!-- <button is="paper-icon-button-light" id="btnBookplayerPrev" class="autoSize bookplayerButton pageButton hide-mouse-idle-tv" tabindex="-1">
-        <span class="material-icons bookplayerButtonIcon navigate_before"></span> ${Previous}
+        <span class="material-icons bookplayerButtonIcon navigate_before" aria-hidden="true"></span> ${Previous}
     </button>
     <button is="paper-icon-button-light" id="btnBookplayerNext" class="autoSize bookplayerButton pageButton hide-mouse-idle-tv" tabindex="-1">
-        ${Next} <span class="material-icons bookplayerButtonIcon navigate_next"></span>
+        ${Next} <span class="material-icons bookplayerButtonIcon navigate_next" aria-hidden="true"></span>
     </button> -->
     <button is="paper-icon-button-light" id="btnBookplayerExit" class="autoSize bookplayerButton hide-mouse-idle-tv" tabindex="-1">
-        <span class="material-icons bookplayerButtonIcon close"></span>
+        <span class="material-icons bookplayerButtonIcon close" aria-hidden="true"></span>
     </button>
     <button is="paper-icon-button-light" id="btnBookplayerFullscreen" class="autoSize bookplayerButton hide-mouse-idle-tv" tabindex="-1">
-        <span class="material-icons bookplayerButtonIcon fullscreen"></span>
+        <span class="material-icons bookplayerButtonIcon fullscreen" aria-hidden="true"></span>
     </button>
 </div>
 
diff --git a/src/plugins/comicsPlayer/plugin.js b/src/plugins/comicsPlayer/plugin.js
index 69882b65b2..8a02926a42 100644
--- a/src/plugins/comicsPlayer/plugin.js
+++ b/src/plugins/comicsPlayer/plugin.js
@@ -144,7 +144,7 @@ export class ComicsPlayer {
 
             elem.innerHTML = `<div class="slideshowSwiperContainer"><div class="swiper-wrapper"></div></div>
 <div class="actionButtons">
-    <button is="paper-icon-button-light" class="autoSize btnExit" tabindex="-1"><i class="material-icons actionButtonIcon close"></i></button>
+    <button is="paper-icon-button-light" class="autoSize btnExit" tabindex="-1"><span class="material-icons actionButtonIcon close" aria-hidden="true"></span></button>
 </div>`;
 
             dialogHelper.open(elem);
diff --git a/src/plugins/pdfPlayer/plugin.js b/src/plugins/pdfPlayer/plugin.js
index 62f80d12e8..7532b5f062 100644
--- a/src/plugins/pdfPlayer/plugin.js
+++ b/src/plugins/pdfPlayer/plugin.js
@@ -171,7 +171,7 @@ export class PdfPlayer {
             let html = '';
             html += '<canvas id="canvas"></canvas>';
             html += '<div class="actionButtons">';
-            html += '<button is="paper-icon-button-light" class="autoSize btnExit" tabindex="-1"><i class="material-icons actionButtonIcon close"></i></button>';
+            html += '<button is="paper-icon-button-light" class="autoSize btnExit" tabindex="-1"><span class="material-icons actionButtonIcon close" aria-hidden="true"></span></button>';
             html += '</div>';
 
             elem.id = 'pdfPlayer';
diff --git a/src/scripts/editorsidebar.js b/src/scripts/editorsidebar.js
index 1ac9df9f7c..2fba0fcfd4 100644
--- a/src/scripts/editorsidebar.js
+++ b/src/scripts/editorsidebar.js
@@ -47,20 +47,20 @@ import Dashboard from './clientUtils';
         }
         let htmlName = "<div class='editorNode'>";
         if (item.IsFolder) {
-            htmlName += '<span class="material-icons metadataSidebarIcon folder"></span>';
+            htmlName += '<span class="material-icons metadataSidebarIcon folder" aria-hidden="true"></span>';
         } else if (item.MediaType === 'Video') {
-            htmlName += '<span class="material-icons metadataSidebarIcon movie"></span>';
+            htmlName += '<span class="material-icons metadataSidebarIcon movie" aria-hidden="true"></span>';
         } else if (item.MediaType === 'Audio') {
-            htmlName += '<span class="material-icons metadataSidebarIcon audiotrack"></span>';
+            htmlName += '<span class="material-icons metadataSidebarIcon audiotrack" aria-hidden="true"></span>';
         } else if (item.Type === 'TvChannel') {
-            htmlName += '<span class="material-icons metadataSidebarIcon live_tv"></span>';
+            htmlName += '<span class="material-icons metadataSidebarIcon live_tv" aria-hidden="true"></span>';
         } else if (item.MediaType === 'Photo') {
-            htmlName += '<span class="material-icons metadataSidebarIcon photo"></span>';
+            htmlName += '<span class="material-icons metadataSidebarIcon photo" aria-hidden="true"></span>';
         } else if (item.MediaType === 'Book') {
-            htmlName += '<span class="material-icons metadataSidebarIcon book"></span>';
+            htmlName += '<span class="material-icons metadataSidebarIcon book" aria-hidden="true"></span>';
         }
         if (item.LockData) {
-            htmlName += '<span class="material-icons metadataSidebarIcon lock"></span>';
+            htmlName += '<span class="material-icons metadataSidebarIcon lock" aria-hidden="true"></span>';
         }
         htmlName += name;
         htmlName += '</div>';
diff --git a/src/scripts/libraryBrowser.js b/src/scripts/libraryBrowser.js
index a928902cb4..7f9480ddae 100644
--- a/src/scripts/libraryBrowser.js
+++ b/src/scripts/libraryBrowser.js
@@ -96,20 +96,20 @@ export function getQueryPagingHtml (options) {
         html += '<div style="display:inline-block;">';
 
         if (showControls) {
-            html += '<button is="paper-icon-button-light" class="btnPreviousPage autoSize" ' + (startIndex ? '' : 'disabled') + '><span class="material-icons arrow_back"></span></button>';
-            html += '<button is="paper-icon-button-light" class="btnNextPage autoSize" ' + (startIndex + limit >= totalRecordCount ? 'disabled' : '') + '><span class="material-icons arrow_forward"></span></button>';
+            html += '<button is="paper-icon-button-light" class="btnPreviousPage autoSize" ' + (startIndex ? '' : 'disabled') + '><span class="material-icons arrow_back" aria-hidden="true"></span></button>';
+            html += '<button is="paper-icon-button-light" class="btnNextPage autoSize" ' + (startIndex + limit >= totalRecordCount ? 'disabled' : '') + '><span class="material-icons arrow_forward" aria-hidden="true"></span></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 || '') + '\');"><span class="material-icons view_comfy"></span></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 || '') + '\');"><span class="material-icons view_comfy" aria-hidden="true"></span></button>';
         }
 
         if (options.sortButton) {
-            html += '<button is="paper-icon-button-light" class="btnSort autoSize" title="' + globalize.translate('Sort') + '"><span class="material-icons sort_by_alpha"></span></button>';
+            html += '<button is="paper-icon-button-light" class="btnSort autoSize" title="' + globalize.translate('Sort') + '"><span class="material-icons sort_by_alpha" aria-hidden="true"></span></button>';
         }
 
         if (options.filterButton) {
-            html += '<button is="paper-icon-button-light" class="btnFilter autoSize" title="' + globalize.translate('Filter') + '"><span class="material-icons filter_list"></span></button>';
+            html += '<button is="paper-icon-button-light" class="btnFilter autoSize" title="' + globalize.translate('Filter') + '"><span class="material-icons filter_list" aria-hidden="true"></span></button>';
         }
 
         html += '</div>';
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
index ea74637839..f1146e4e5d 100644
--- a/src/scripts/libraryMenu.js
+++ b/src/scripts/libraryMenu.js
@@ -25,18 +25,18 @@ import Headroom from 'headroom.js';
         let 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"><span class="material-icons ' + (browser.safari ? 'chevron_left' : 'arrow_back') + '"></span></button>';
-        html += '<button type="button" is="paper-icon-button-light" class="headerButton headerHomeButton hide barsMenuButton headerButtonLeft"><span class="material-icons home"></span></button>';
-        html += '<button type="button" is="paper-icon-button-light" class="headerButton mainDrawerButton barsMenuButton headerButtonLeft hide"><span class="material-icons menu"></span></button>';
+        html += '<button type="button" is="paper-icon-button-light" class="headerButton headerButtonLeft headerBackButton hide"><span class="material-icons ' + (browser.safari ? 'chevron_left' : 'arrow_back') + '" aria-hidden="true"></span></button>';
+        html += '<button type="button" is="paper-icon-button-light" class="headerButton headerHomeButton hide barsMenuButton headerButtonLeft"><span class="material-icons home" aria-hidden="true"></span></button>';
+        html += '<button type="button" is="paper-icon-button-light" class="headerButton mainDrawerButton barsMenuButton headerButtonLeft hide"><span class="material-icons menu" aria-hidden="true"></span></button>';
         html += '<h3 class="pageTitle"></h3>';
         html += '</div>';
         html += '<div class="headerRight">';
-        html += '<button is="paper-icon-button-light" class="headerSyncButton syncButton headerButton headerButtonRight hide"><span class="material-icons groups"></span></button>';
+        html += '<button is="paper-icon-button-light" class="headerSyncButton syncButton headerButton headerButtonRight hide"><span class="material-icons groups" aria-hidden="true"></span></button>';
         html += '<span class="headerSelectedPlayer"></span>';
-        html += '<button is="paper-icon-button-light" class="headerAudioPlayerButton audioPlayerButton headerButton headerButtonRight hide"><span class="material-icons music_note"></span></button>';
-        html += '<button is="paper-icon-button-light" class="headerCastButton castButton headerButton headerButtonRight hide"><span class="material-icons cast"></span></button>';
-        html += '<button type="button" is="paper-icon-button-light" class="headerButton headerButtonRight headerSearchButton hide"><span class="material-icons search"></span></button>';
-        html += '<button is="paper-icon-button-light" class="headerButton headerButtonRight headerUserButton hide"><span class="material-icons person"></span></button>';
+        html += '<button is="paper-icon-button-light" class="headerAudioPlayerButton audioPlayerButton headerButton headerButtonRight hide"><span class="material-icons music_note" aria-hidden="true"></span></button>';
+        html += '<button is="paper-icon-button-light" class="headerCastButton castButton headerButton headerButtonRight hide"><span class="material-icons cast" aria-hidden="true"></span></button>';
+        html += '<button type="button" is="paper-icon-button-light" class="headerButton headerButtonRight headerSearchButton hide"><span class="material-icons search" aria-hidden="true"></span></button>';
+        html += '<button is="paper-icon-button-light" class="headerButton headerButtonRight headerUserButton hide"><span class="material-icons person" aria-hidden="true"></span></button>';
         html += '</div>';
         html += '</div>';
         html += '<div class="headerTabs sectionTabs hide">';
@@ -156,7 +156,7 @@ import Headroom from 'headroom.js';
             headerUserButton.innerHTML = '<div class="headerButton headerButtonRight paper-icon-button-light headerUserButtonRound" style="background-image:url(\'' + src + "');\"></div>";
         } else {
             headerUserButton.classList.remove('headerUserButtonRound');
-            headerUserButton.innerHTML = '<span class="material-icons person"></span>';
+            headerUserButton.innerHTML = '<span class="material-icons person" aria-hidden="true"></span>';
         }
     }
 
@@ -272,7 +272,7 @@ import Headroom from 'headroom.js';
     function refreshLibraryInfoInDrawer(user) {
         let html = '';
         html += '<div style="height:.5em;"></div>';
-        html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" href="#!/home.html"><span class="material-icons navMenuOptionIcon home"></span><span class="navMenuOptionText">' + globalize.translate('Home') + '</span></a>';
+        html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder" href="#!/home.html"><span class="material-icons navMenuOptionIcon home" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('Home')}</span></a>`;
 
         // placeholder for custom menu links
         html += '<div class="customMenuOptions"></div>';
@@ -285,8 +285,8 @@ import Headroom from 'headroom.js';
             html += '<h3 class="sidebarHeader">';
             html += globalize.translate('HeaderAdmin');
             html += '</h3>';
-            html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkManageServer" data-itemid="dashboard" href="#!/dashboard.html"><span class="material-icons navMenuOptionIcon dashboard"></span><span class="navMenuOptionText">' + globalize.translate('TabDashboard') + '</span></a>';
-            html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder editorViewMenu" data-itemid="editor" href="#!/edititemmetadata.html"><span class="material-icons navMenuOptionIcon mode_edit"></span><span class="navMenuOptionText">' + globalize.translate('Metadata') + '</span></a>';
+            html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder lnkManageServer" data-itemid="dashboard" href="#!/dashboard.html"><span class="material-icons navMenuOptionIcon dashboard" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('TabDashboard')}</span></a>`;
+            html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder editorViewMenu" data-itemid="editor" href="#!/edititemmetadata.html"><span class="material-icons navMenuOptionIcon mode_edit" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('Metadata')}</span></a>`;
             html += '</div>';
         }
 
@@ -297,14 +297,14 @@ import Headroom from 'headroom.js';
             html += '</h3>';
 
             if (appHost.supports('multiserver')) {
-                html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnSelectServer" data-itemid="selectserver" href="#"><span class="material-icons navMenuOptionIcon wifi"></span><span class="navMenuOptionText">' + globalize.translate('SelectServer') + '</span></a>';
+                html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnSelectServer" data-itemid="selectserver" href="#"><span class="material-icons navMenuOptionIcon wifi" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('SelectServer')}</span></a>`;
             }
 
-            html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnSettings" data-itemid="settings" href="#"><span class="material-icons navMenuOptionIcon settings"></span><span class="navMenuOptionText">' + globalize.translate('Settings') + '</span></a>';
-            html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnLogout" data-itemid="logout" href="#"><span class="material-icons navMenuOptionIcon exit_to_app"></span><span class="navMenuOptionText">' + globalize.translate('ButtonSignOut') + '</span></a>';
+            html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnSettings" data-itemid="settings" href="#"><span class="material-icons navMenuOptionIcon settings" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('Settings')}</span></a>`;
+            html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder btnLogout" data-itemid="logout" href="#"><span class="material-icons navMenuOptionIcon exit_to_app" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('ButtonSignOut')}</span></a>`;
 
             if (appHost.supports('exitmenu')) {
-                html += '<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder exitApp" data-itemid="exitapp" href="#"><span class="material-icons navMenuOptionIcon close"></span><span class="navMenuOptionText">' + globalize.translate('ButtonExitApp') + '</span></a>';
+                html += `<a is="emby-linkbutton" class="navMenuOption lnkMediaFolder exitApp" data-itemid="exitapp" href="#"><span class="material-icons navMenuOptionIcon close" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('ButtonExitApp')}</span></a>`;
             }
 
             html += '</div>';
@@ -538,7 +538,7 @@ import Headroom from 'headroom.js';
         menuHtml += '<a is="emby-linkbutton" class="navMenuOption" href="' + item.href + '"' + pageIds + pageUrls + '>';
 
         if (item.icon) {
-            menuHtml += '<span class="material-icons navMenuOptionIcon ' + item.icon + '"></span>';
+            menuHtml += '<span class="material-icons navMenuOptionIcon ' + item.icon + '" aria-hidden="true"></span>';
         }
 
         menuHtml += '<span class="navMenuOptionText">';
@@ -659,6 +659,7 @@ import Headroom from 'headroom.js';
 
                     const icon = document.createElement('span');
                     icon.className = `material-icons navMenuOptionIcon ${link.icon || 'link'}`;
+                    icon.setAttribute('aria-hidden', 'true');
                     option.appendChild(icon);
 
                     const label = document.createElement('span');
@@ -682,7 +683,7 @@ import Headroom from 'headroom.js';
                     const itemId = i.Id;
 
                     return `<a is="emby-linkbutton" data-itemid="${itemId}" class="lnkMediaFolder navMenuOption" href="${getItemHref(i, i.CollectionType)}">
-                                    <span class="material-icons navMenuOptionIcon ${icon}"></span>
+                                    <span class="material-icons navMenuOptionIcon ${icon}" aria-hidden="true"></span>
                                     <span class="sectionName navMenuOptionText">${i.Name}</span>
                                   </a>`;
                 }).join('');