diff --git a/src/controllers/session/selectServer/index.js b/src/controllers/session/selectServer/index.js
index 75a0b0789d..3db27beb1f 100644
--- a/src/controllers/session/selectServer/index.js
+++ b/src/controllers/session/selectServer/index.js
@@ -28,24 +28,15 @@ import cardBuilder from '../../../components/cardbuilder/cardBuilder';
         const items = servers.map(function (server) {
             return {
                 name: server.Name,
-                showIcon: true,
-                icon: 'cast',
+                icon: 'storage',
                 cardType: '',
                 id: server.Id,
                 server: server
             };
         });
         let html = items.map(function (item) {
-            let cardImageContainer;
-
-            if (item.showIcon) {
-                cardImageContainer = '<span class="cardImageIcon material-icons ' + item.icon + '" aria-hidden="true"></span>';
-            } else {
-                cardImageContainer = '<div class="cardImage" style="' + item.cardImageStyle + '"></div>';
-            }
-
             // TODO move card creation code to Card component
-
+            const cardImageContainer = '<span class="cardImageIcon material-icons ' + item.icon + '" aria-hidden="true"></span>';
             let cssClass = 'card overflowSquareCard loginSquareCard scalableCard overflowSquareCard-scalable';
 
             if (layoutManager.tv) {
diff --git a/src/controllers/user/menu/index.html b/src/controllers/user/menu/index.html
index 2741f89282..1c83bd9d68 100644
--- a/src/controllers/user/menu/index.html
+++ b/src/controllers/user/menu/index.html
@@ -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">
-                        <span class="material-icons listItemIcon listItemIcon-transparent tap_and_play" aria-hidden="true"></span>
+                        <span class="material-icons listItemIcon listItemIcon-transparent phonelink_lock" aria-hidden="true"></span>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${QuickConnect}</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" aria-hidden="true"></span>
+                        <span class="material-icons listItemIcon listItemIcon-transparent storage" aria-hidden="true"></span>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${SelectServer}</div>
                         </div>
diff --git a/src/scripts/libraryMenu.js b/src/scripts/libraryMenu.js
index 6065d9a8d5..3afc730c33 100644
--- a/src/scripts/libraryMenu.js
+++ b/src/scripts/libraryMenu.js
@@ -325,7 +325,7 @@ import '../assets/css/flexstyles.scss';
             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" aria-hidden="true"></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 storage" 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" aria-hidden="true"></span><span class="navMenuOptionText">${globalize.translate('Settings')}</span></a>`;