diff --git a/src/components/apphost.js b/src/components/apphost.js
index 2a0b7b19e9..22d61cc086 100644
--- a/src/components/apphost.js
+++ b/src/components/apphost.js
@@ -374,7 +374,7 @@ define(["appSettings", "browser", "events", "htmlMediaHelper"], function (appSet
             return -1 !== supportedFeatures.indexOf(command.toLowerCase());
         },
         preferVisualCards: browser.android || browser.chrome,
-        moreIcon: browser.android ? "dots-vert" : "dots-horiz",
+        moreIcon: browser.android ? "more_vert" : "more_horiz",
         getSyncProfile: getSyncProfile,
         getDefaultLayout: function () {
             if (window.NativeShell) {
diff --git a/src/components/guide/tvguide.template.html b/src/components/guide/tvguide.template.html
index 5dc16dba3b..ef3c4b58ca 100644
--- a/src/components/guide/tvguide.template.html
+++ b/src/components/guide/tvguide.template.html
@@ -33,6 +33,6 @@
         <i class="material-icons arrow_back"></i>
     </button>
     <button is="paper-icon-button-light" type="button" class="btnNextPage">
-        <i class="material-icons">arrow_forward</i>
+        <i class="material-icons arrow_forward"></i>
     </button>
 </div>
diff --git a/src/itemdetails.html b/src/itemdetails.html
index 100e3f968a..ec3ada09d6 100644
--- a/src/itemdetails.html
+++ b/src/itemdetails.html
@@ -31,7 +31,7 @@
 
                 <button is="emby-button" type="button" class="button-flat btnDownload hide detailButton">
                     <div class="detailButton-content">
-                        <i class="material-icons detailButton-icon">&#xe884;</i>
+                        <i class="material-icons detailButton-icon get_app"></i>
                         <div class="detailButton-text">${ButtonDownload}</div>
                     </div>
                 </button>
@@ -94,7 +94,7 @@
 
                 <button is="emby-button" type="button" class="button-flat btnSplitVersions hide detailButton">
                     <div class="detailButton-content">
-                        <i class="material-icons detailButton-icon">call_split</i>
+                        <i class="material-icons detailButton-icon call_split"></i>
                         <div class="detailButton-text">${ButtonSplit}</div>
                     </div>
                 </button>
diff --git a/src/mypreferencesmenu.html b/src/mypreferencesmenu.html
index f7948a0789..41fcd1b75c 100644
--- a/src/mypreferencesmenu.html
+++ b/src/mypreferencesmenu.html
@@ -32,7 +32,7 @@
 
                 <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="lnkPlaybackPreferences listItem-border">
                     <div class="listItem">
-                        <i class="material-icons listItemIcon listItemIcon-transparent">play_circle_filled</i>
+                        <i class="material-icons listItemIcon listItemIcon-transparent play_circle_filled"></i>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${TitlePlayback}</div>
                         </div>
@@ -60,7 +60,7 @@
                 </a>
                 <a is="emby-linkbutton" href="edititemmetadata.html" style="display:block;padding:0;margin:0;" class="listItem-border">
                     <div class="listItem">
-                        <i class="material-icons listItemIcon listItemIcon-transparent">mode_edit</i>
+                        <i class="material-icons listItemIcon listItemIcon-transparent mode_edit"></i>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${Metadata}</div>
                         </div>
@@ -79,7 +79,7 @@
                 </a>
                 <a is="emby-linkbutton" data-ripple="false" href="#" style="display:block;padding:0;margin:0;" class="btnLogout listItem-border">
                     <div class="listItem">
-                        <i class="material-icons listItemIcon listItemIcon-transparent">exit_to_app</i>
+                        <i class="material-icons listItemIcon listItemIcon-transparent exit_to_app"></i>
                         <div class="listItemBody">
                             <div class="listItemBodyText">${ButtonSignOut}</div>
                         </div>
diff --git a/src/nowplaying.html b/src/nowplaying.html
index 690aa2f5fe..b106241492 100644
--- a/src/nowplaying.html
+++ b/src/nowplaying.html
@@ -87,10 +87,10 @@
                                 <i class="material-icons keyboard_arrow_left"></i>
                             </button>
                             <button is="paper-icon-button-light" class="btnOk btnCommand autoSize button-submit" title="${ButtonOk}" data-command="Select">
-                                <i class="material-icons">keyboard_return</i>
+                                <i class="material-icons keyboard_return"></i>
                             </button>
                             <button is="paper-icon-button-light" class="btnArrowRight btnCommand autoSize button-submit" title="${ButtonArrowRight}" data-command="MoveRight">
-                                <i class="material-icons">keyboard_arrow_right</i>
+                                <i class="material-icons keyboard_arrow_right"></i>
                             </button>
                         </div>
                         <br />
diff --git a/src/wizardlibrary.html b/src/wizardlibrary.html
index 660b508f22..4fad656581 100644
--- a/src/wizardlibrary.html
+++ b/src/wizardlibrary.html
@@ -16,7 +16,7 @@
                 </button>
                 <button is="emby-button" type="button" class="raised button-submit" onclick="WizardLibraryPage.next();">
                     <span>${LabelNext}</span>
-                    <i class="material-icons">arrow_forward</i>
+                    <i class="material-icons arrow_forward"></i>
                 </button>
             </div>
         </div>
diff --git a/src/wizardremoteaccess.html b/src/wizardremoteaccess.html
index 8a830d6244..c7ddfb7e84 100644
--- a/src/wizardremoteaccess.html
+++ b/src/wizardremoteaccess.html
@@ -26,7 +26,7 @@
                     </button>
                     <button is="emby-button" type="submit" class="raised button-submit">
                         <span>${LabelNext}</span>
-                        <i class="material-icons">arrow_forward</i>
+                        <i class="material-icons arrow_forward"></i>
                     </button>
                 </div>
             </form>
diff --git a/src/wizardsettings.html b/src/wizardsettings.html
index 5850167c54..f753919478 100644
--- a/src/wizardsettings.html
+++ b/src/wizardsettings.html
@@ -21,7 +21,7 @@
                     </button>
                     <button is="emby-button" type="submit" class="raised button-submit">
                         <span>${LabelNext}</span>
-                        <i class="material-icons">arrow_forward</i>
+                        <i class="material-icons arrow_forward"></i>
                     </button>
                 </div>
             </form>
diff --git a/src/wizardstart.html b/src/wizardstart.html
index 5dd6f7e1b8..a47fcad090 100644
--- a/src/wizardstart.html
+++ b/src/wizardstart.html
@@ -20,7 +20,7 @@
                 <div class="wizardNavigation" style="text-align:right;">
                     <button is="emby-button" type="submit" class="raised button-submit">
                         <span>${LabelNext}</span>
-                        <i class="material-icons">arrow_forward</i>
+                        <i class="material-icons arrow_forward"></i>
                     </button>
                 </div>
             </form>
diff --git a/src/wizarduser.html b/src/wizarduser.html
index 9f54d7ca67..90f492b0fe 100644
--- a/src/wizarduser.html
+++ b/src/wizarduser.html
@@ -27,7 +27,7 @@
                     </button>
                     <button is="emby-button" type="submit" class="raised button-submit">
                         <span>${LabelNext}</span>
-                        <i class="material-icons">arrow_forward</i>
+                        <i class="material-icons arrow_forward"></i>
                     </button>
                 </div>
             </form>