diff --git a/dashboard-ui/addplugin.html b/dashboard-ui/addplugin.html
index 089c23096d..d13eeb9863 100644
--- a/dashboard-ui/addplugin.html
+++ b/dashboard-ui/addplugin.html
@@ -27,7 +27,7 @@
 
                             <p id="btnInstallDiv" class="hide">
                                 <button is="emby-button" type="submit" id="btnInstall" class="raised submit block">
-                                    <iron-icon icon="check"></iron-icon><span>${Install}</span>
+                                    <i class="md-icon">check</i><span>${Install}</span>
                                 </button>
                             </p>
                             <p id="nonServerMsg"></p>
@@ -65,7 +65,7 @@
                                         <input type="hidden" name="notify_url" value="https://mb3admin.com/admin/service/services/ppipn.php">
                                         <input type="hidden" name="return" id="paypalReturnUrl" value="#">
                                         <button is="emby-button" type="submit" id="ppButton" class="raised block" style="background-color: #179BD7;color:#fff;">
-                                            <iron-icon icon="check"></iron-icon>
+                                            <i class="md-icon">check</i>
                                             <span>${RegisterWithPayPal}</span>
                                         </button>
 
diff --git a/dashboard-ui/autoorganizelog.html b/dashboard-ui/autoorganizelog.html
index f2dce579f0..e8d9433b8d 100644
--- a/dashboard-ui/autoorganizelog.html
+++ b/dashboard-ui/autoorganizelog.html
@@ -6,7 +6,7 @@
 
                 <div style="text-align:right;" class="organizeTaskPanel hide">
                     <button is="emby-button" type="button" class="btnClearLog raised subdued"><iron-icon icon="clear-all"></iron-icon><span>${ButtonClear}</span></button>
-                    <button is="emby-button" type="button" class="btnOrganize raised subdued"><iron-icon icon="check"></iron-icon><span>${ButtonOrganize}</span></button>
+                    <button is="emby-button" type="button" class="btnOrganize raised subdued"><i class="md-icon">check</i><span>${ButtonOrganize}</span></button>
                     <progress max="100" min="0" style="width:100px;" class="organizeProgress"></progress>
                 </div>
                 <div class="listTopPaging">
diff --git a/dashboard-ui/autoorganizetv.html b/dashboard-ui/autoorganizetv.html
index 3a7103b57f..308de1af44 100644
--- a/dashboard-ui/autoorganizetv.html
+++ b/dashboard-ui/autoorganizetv.html
@@ -15,7 +15,7 @@
                     </li>
                     <li>
                         <paper-input id="txtWatchFolder" label="${LabelWatchFolder}" style="width:85%;display:inline-block;"></paper-input>
-                        <button type="button" is="paper-icon-button-light" id="btnSelectWatchFolder" title="${ButtonSelectDirectory}"><iron-icon icon="search"></iron-icon></button>
+                        <button type="button" is="paper-icon-button-light" id="btnSelectWatchFolder" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
                         <div class="fieldDescription">
                             <div>${LabelWatchFolderHelp}</div>
                         </div>
@@ -154,7 +154,7 @@
 
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                        <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                     </li>
 
                 </ul>
diff --git a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
index be322d7279..df7a9eb079 100644
--- a/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
+++ b/dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css
@@ -111,6 +111,10 @@
         margin-left: .5em;
     }
 
+    [is="emby-button"] span + i {
+        margin-left: .5em;
+    }
+
     [is="emby-button"]:not(.autoSize) i {
         font-size: 24px;
         width: 24px;
diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html
index 73276f836d..3cb858f875 100644
--- a/dashboard-ui/cinemamodeconfiguration.html
+++ b/dashboard-ui/cinemamodeconfiguration.html
@@ -49,7 +49,7 @@
                 <div>
                     <div>
                         <paper-input type="text" label="${LabelCustomIntrosPath}" id="txtCustomIntrosPath" style="display: inline-block; width: 85%;"></paper-input>
-                        <button type="button" is="paper-icon-button-light" id="btnSelectCustomIntrosPath" title="${ButtonSelectDirectory}"><iron-icon icon="search"></iron-icon></button>
+                        <button type="button" is="paper-icon-button-light" id="btnSelectCustomIntrosPath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
                     </div>
                     <div class="fieldDescription">${LabelCustomIntrosPathHelp}</div>
                 </div>
@@ -57,7 +57,7 @@
                 <div>
                     <div>
                         <paper-input type="text" label="${LabelCodecIntrosPath}" id="txtCodecIntrosPath" style="display: inline-block; width: 85%;"></paper-input>
-                        <button type="button" is="paper-icon-button-light" id="btnSelectCodecIntrosPath" title="${ButtonSelectDirectory}"><iron-icon icon="search"></iron-icon></button>
+                        <button type="button" is="paper-icon-button-light" id="btnSelectCodecIntrosPath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
                     </div>
                     <div class="fieldDescription">
                         <div>${LabelCodecIntrosPathHelp}</div>
@@ -66,7 +66,7 @@
                 </div>
                 <br />
                 <br />
-                <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                 <p>${CinemaModeConfigurationHelp2}</p>
             </form>
         </div>
diff --git a/dashboard-ui/components/itemidentifier/itemidentifier.js b/dashboard-ui/components/itemidentifier/itemidentifier.js
index f6e96ce13c..1992dd3856 100644
--- a/dashboard-ui/components/itemidentifier/itemidentifier.js
+++ b/dashboard-ui/components/itemidentifier/itemidentifier.js
@@ -179,7 +179,7 @@
             html += '<div class="cardImage" style="background-image:url(\'' + displayUrl + '\');"></div>';
         } else {
 
-            html += '<div class="cardImage iconCardImage"><iron-icon icon="search"></iron-icon></div>';
+            html += '<div class="cardImage iconCardImage"><i class="md-icon">search</i></div>';
         }
         html += '</a>';
         html += '</div>';
diff --git a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
index 15c36e196e..9607eb36a3 100644
--- a/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
+++ b/dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
@@ -17,7 +17,7 @@
     <div>
         <h1 style="display:inline-block;vertical-align:middle;">${HeadersFolders}</h1>
         <button is="emby-button" type="button" class="raised btnAddFolder submit mini" style="margin-left:1em;" title="${ButtonAdd}">
-            <iron-icon icon="add"></iron-icon>
+            <i class="md-icon">add</i>
             <span>${ButtonAdd}</span>
         </button>
     </div>
@@ -26,7 +26,7 @@
     <br />
     <div>
         <button is="emby-button" type="submit" class="raised submit block">
-            <iron-icon icon="check"></iron-icon>
+            <i class="md-icon">check</i>
             <span>${ButtonOk}</span>
         </button>
     </div>
diff --git a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.template.html b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.template.html
index f4dbf3a691..5c19a71c81 100644
--- a/dashboard-ui/components/medialibraryeditor/medialibraryeditor.template.html
+++ b/dashboard-ui/components/medialibraryeditor/medialibraryeditor.template.html
@@ -1,7 +1,7 @@
 <div>
     <h1 style="display:inline-block;vertical-align:middle;">${HeadersFolders}</h1>
     <button is="emby-button" type="button" class="raised btnAddFolder submit mini" style="margin-left:1em;" title="${ButtonAdd}">
-        <iron-icon icon="add"></iron-icon>
+        <i class="md-icon">add</i>
         <span>${ButtonAdd}</span>
     </button>
 </div>
diff --git a/dashboard-ui/components/tvproviders/schedulesdirect.template.html b/dashboard-ui/components/tvproviders/schedulesdirect.template.html
index fef8142ae5..3fd309fe39 100644
--- a/dashboard-ui/components/tvproviders/schedulesdirect.template.html
+++ b/dashboard-ui/components/tvproviders/schedulesdirect.template.html
@@ -20,7 +20,7 @@
             <paper-input class="txtPass" label="${LabelPassword}" required="required" autocomplete="off" type="password"></paper-input>
         </div>
         <div>
-            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+            <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
         </div>
     </div>
@@ -64,8 +64,8 @@
             </div>
             <br /><br />
             <div>
-                <button is="emby-button" type="submit" class="raised submit block btnSubmitListingsContainer btnSubmitListings hide"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
-                <button is="emby-button" type="button" class="raised cancel block btnCancel hide" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
+                <button is="emby-button" type="submit" class="raised submit block btnSubmitListingsContainer btnSubmitListings hide"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                <button is="emby-button" type="button" class="raised cancel block btnCancel hide" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
             </div>
         </div>
     </form>
diff --git a/dashboard-ui/components/tvproviders/xmltv.template.html b/dashboard-ui/components/tvproviders/xmltv.template.html
index 5deb522ed3..e98a8a08f4 100644
--- a/dashboard-ui/components/tvproviders/xmltv.template.html
+++ b/dashboard-ui/components/tvproviders/xmltv.template.html
@@ -7,7 +7,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"><iron-icon icon="search"></iron-icon></button>
+                <button type="button" is="paper-icon-button-light" id="btnSelectPath" class="autoSize"><i class="md-icon">search</i></button>
             </div>
             <div class="fieldDescription">${XmlTvPathHelp}</div>
         </div>
@@ -44,7 +44,7 @@
         <a class="lnkPremiere" href="https://emby.media/premiere">${ButtonLearnMore}</a>
     </div><br />
     <div>
-        <button is="emby-button" type="submit" class="raised submit block btnSubmitListings hide"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
-        <button is="emby-button" type="button" class="raised cancel block btnCancel hide" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
+        <button is="emby-button" type="submit" class="raised submit block btnSubmitListings hide"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+        <button is="emby-button" type="button" class="raised cancel block btnCancel hide" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
     </div>
 </form>
\ No newline at end of file
diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index 59b49b727c..5a0767c20e 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -42,7 +42,7 @@
 
                             <div style="margin-top: 1em;">
                                 <button is="emby-button" type="button" class="raised subdued btnRestartContainer hide" onclick="DashboardPage.restart();"><iron-icon icon="refresh"></iron-icon><span>${ButtonRestart}</span></button>
-                                <button is="emby-button" type="button" id="btnShutdown" class="raised subdued" onclick="DashboardPage.shutdown();"><iron-icon icon="close"></iron-icon><span>${ButtonShutdown}</span></button>
+                                <button is="emby-button" type="button" id="btnShutdown" class="raised subdued" onclick="DashboardPage.shutdown();"><i class="md-icon">close</i><span>${ButtonShutdown}</span></button>
                             </div>
                         </div>
                     </div>
diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html
index 9d81f683eb..ff0add52c3 100644
--- a/dashboard-ui/dashboardgeneral.html
+++ b/dashboard-ui/dashboardgeneral.html
@@ -122,7 +122,7 @@
                         <ul data-role="listview" class="ulForm">
                             <li>
                                 <paper-input type="text" id="txtDashboardSourcePath" label="${LabelDashboardSourcePath}" style="display: inline-block; width: 80%;"></paper-input>
-                                <button type="button" is="paper-icon-button-light" id="btnSelectDashboardSourcePath" title="${ButtonSelectDirectory}"><iron-icon icon="search"></iron-icon></button>
+                                <button type="button" is="paper-icon-button-light" id="btnSelectDashboardSourcePath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
                                 <div class="fieldDescription">${LabelDashboardSourcePathHelp}</div>
                             </li>
                         </ul>
@@ -131,7 +131,7 @@
                 <br />
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                        <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                     </li>
 
                 </ul>
diff --git a/dashboard-ui/dashboardhosting.html b/dashboard-ui/dashboardhosting.html
index e17dd2477d..e8eb9a104b 100644
--- a/dashboard-ui/dashboardhosting.html
+++ b/dashboard-ui/dashboardhosting.html
@@ -31,7 +31,7 @@
                         <div style="flex-grow:1;">
                             <input is="emby-input" type="text" id="txtCertificatePath" label="${LabelCustomCertificatePath}" />
                         </div>
-                        <button type="button" is="paper-icon-button-light" id="btnSelectCertPath" title="${ButtonSelectDirectory}"><iron-icon icon="search"></iron-icon></button>
+                        <button type="button" is="paper-icon-button-light" id="btnSelectCertPath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
                     </div>
                     <div class="fieldDescription">${LabelCustomCertificatePathHelp}</div>
                 </div>
@@ -53,7 +53,7 @@
                 <br />
                 <br />
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                 </div>
             </form>
 
diff --git a/dashboard-ui/device.html b/dashboard-ui/device.html
index 953f831c82..aa589c0f3f 100644
--- a/dashboard-ui/device.html
+++ b/dashboard-ui/device.html
@@ -17,14 +17,14 @@
                         </li>
                         <li id="fldCameraUploadPath" style="display:none;">
                             <paper-input id="txtUploadPath" label="${LabelCameraUploadPath}" style="width:85%;display:inline-block;"></paper-input>
-                            <button type="button" is="paper-icon-button-light" id="btnSelectUploadPath" title="${ButtonSelectDirectory}"><iron-icon icon="search"></iron-icon></button>
+                            <button type="button" is="paper-icon-button-light" id="btnSelectUploadPath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
                             <div class="fieldDescription">${LabelCameraUploadPathHelp}</div>
                         </li>
 
                     </ul><br />
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                            <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                         </li>
                     </ul>
 
diff --git a/dashboard-ui/devicesupload.html b/dashboard-ui/devicesupload.html
index 8827d4a55f..70e9c7e734 100644
--- a/dashboard-ui/devicesupload.html
+++ b/dashboard-ui/devicesupload.html
@@ -12,7 +12,7 @@
                     <ul data-role="listview" class="ulForm">
                         <li>
                             <paper-input id="txtUploadPath" label="${LabelCameraUploadPath}" style="width:84%;display:inline-block;"></paper-input>
-                            <button type="button" is="paper-icon-button-light" id="btnSelectUploadPath" title="${ButtonSelectDirectory}"><iron-icon icon="search"></iron-icon></button>
+                            <button type="button" is="paper-icon-button-light" id="btnSelectUploadPath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
                             <div class="fieldDescription">${LabelCameraUploadPathHelp}</div>
                         </li>
                         <li>
@@ -24,7 +24,7 @@
                     </ul><br />
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                            <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                         </li>
                     </ul>
 
diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html
index 4279b39e29..fe444d6542 100644
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@@ -102,7 +102,7 @@
                             <div>
                                 <h2 style="vertical-align:middle;display:inline-block;">${HeaderHttpHeaders}</h2>
                                 <button is="emby-button" type="button" class="raised submit mini btnAddIdentificationHttpHeader" style="margin-left:1em;">
-                                    <iron-icon icon="add"></iron-icon>
+                                    <i class="md-icon">add</i>
                                     <span>${ButtonNew}</span>
                                 </button>
                             </div>
@@ -269,7 +269,7 @@
                             <div>
                                 <h2 style="vertical-align:middle;display:inline-block;">${HeaderXmlDocumentAttributes}</h2>
                                 <button is="emby-button" type="button" class="raised submit mini btnAddXmlDocumentAttribute" style="margin-left:1em;">
-                                    <iron-icon icon="add"></iron-icon>
+                                    <i class="md-icon">add</i>
                                     <span>${ButtonNew}</span>
                                 </button>
                             </div>
@@ -311,17 +311,15 @@
                     <div class="mediaProfiles"></div>
                 </div>
                 <br />
-                <ul data-role="listview" class="ulForm">
-                    <li>
-                        <button class="btnSave" type="submit" data-theme="b" data-icon="check" data-mini="true">
-                            ${ButtonSave}
-                        </button>
-                        <button type="button" onclick="Dashboard.navigate('dlnaprofiles.html');" data-icon="delete" data-mini="true">
-                            ${ButtonCancel}
-                        </button>
-                    </li>
+                <div>
+                    <button is="emby-button" type="submit" class="raised submit block">
+                        <i class="md-icon">check</i><span>${ButtonSave}</span>
+                    </button>
+                    <button is="emby-button" type="button" class="subdued raised block" onclick="Dashboard.navigate('dlnaprofiles.html');">
+                        <i class="md-icon">close</i><span>${ButtonCancel}</span>
+                    </button>
 
-                </ul>
+                </div>
             </form>
 
         </div>
diff --git a/dashboard-ui/dlnaprofiles.html b/dashboard-ui/dlnaprofiles.html
index e14b98ef02..70f0843d2c 100644
--- a/dashboard-ui/dlnaprofiles.html
+++ b/dashboard-ui/dlnaprofiles.html
@@ -10,7 +10,7 @@
                     <div style="position: absolute; right: 0; top: -12px;">
                         <a class="clearLink" href="dlnaprofile.html">
                             <button is="emby-button" type="button" class="raised submit mini">
-                                <iron-icon icon="add"></iron-icon>
+                                <i class="md-icon">add</i>
                                 <span>${ButtonNew}</span>
                             </button>
                         </a>
diff --git a/dashboard-ui/dlnasettings.html b/dashboard-ui/dlnasettings.html
index c40e6e89ed..8dd653117c 100644
--- a/dashboard-ui/dlnasettings.html
+++ b/dashboard-ui/dlnasettings.html
@@ -44,7 +44,9 @@
                 </ul>
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                        <button is="emby-button" type="submit" class="raised submit block">
+                            <i class="md-icon">check</i><span>${ButtonSave}</span>
+                        </button>
                     </li>
                 </ul>
             </form>
diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html
index dc64beaee4..057017446f 100644
--- a/dashboard-ui/encodingsettings.html
+++ b/dashboard-ui/encodingsettings.html
@@ -69,7 +69,7 @@
                 </div>
 
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/librarydisplay.html b/dashboard-ui/librarydisplay.html
index ea05d85ee4..f29e22f1b5 100644
--- a/dashboard-ui/librarydisplay.html
+++ b/dashboard-ui/librarydisplay.html
@@ -27,7 +27,7 @@
                 </div>
                 <br />
                 <br />
-                <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
             </form>
         </div>
diff --git a/dashboard-ui/librarypathmapping.html b/dashboard-ui/librarypathmapping.html
index 557feee496..d5ecab12f6 100644
--- a/dashboard-ui/librarypathmapping.html
+++ b/dashboard-ui/librarypathmapping.html
@@ -26,7 +26,7 @@
                         <div class="fieldDescription">${LabelToHelp}</div>
                     </div>
                     <br />
-                    <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="add"></iron-icon><span>${ButtonAdd}</span></button>
+                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">add</i><span>${ButtonAdd}</span></button>
                 </div>
 
             </form>
diff --git a/dashboard-ui/librarysettings.html b/dashboard-ui/librarysettings.html
index b153783542..5de5e4c704 100644
--- a/dashboard-ui/librarysettings.html
+++ b/dashboard-ui/librarysettings.html
@@ -26,7 +26,7 @@
                     </li>
                     <li>
                         <paper-input id="txtMetadataPath" label="${LabelMetadataPath}" style="width:85%;display:inline-block;"></paper-input>
-                        <button type="button" is="paper-icon-button-light" id="btnSelectMetadataPath" title="${ButtonSelectDirectory}"><iron-icon icon="search"></iron-icon></button>
+                        <button type="button" is="paper-icon-button-light" id="btnSelectMetadataPath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
                         <div class="fieldDescription">${LabelMetadataPathHelp}</div>
                         <br />
                     </li>
@@ -132,7 +132,7 @@
 
                 <br />
                 <br />
-                <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
             </form>
 
diff --git a/dashboard-ui/livetvseriestimer.html b/dashboard-ui/livetvseriestimer.html
index 77d3671803..0a2a270f9a 100644
--- a/dashboard-ui/livetvseriestimer.html
+++ b/dashboard-ui/livetvseriestimer.html
@@ -57,9 +57,9 @@
                 </div>
                 <br />
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
-                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
+                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
                 </div>
             </form>
 
diff --git a/dashboard-ui/livetvsettings.html b/dashboard-ui/livetvsettings.html
index af6d6f0d51..0fc9956203 100644
--- a/dashboard-ui/livetvsettings.html
+++ b/dashboard-ui/livetvsettings.html
@@ -32,7 +32,7 @@
                 <div>
                     <br />
                     <paper-input id="txtRecordingPath" label="${LabelRecordingPath}" style="width:84%;display:inline-block;"></paper-input>
-                    <button type="button" is="paper-icon-button-light" id="btnSelectRecordingPath" title="${ButtonSelectDirectory}"><iron-icon icon="search"></iron-icon></button>
+                    <button type="button" is="paper-icon-button-light" id="btnSelectRecordingPath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
                     <div class="fieldDescription">${LabelRecordingPathHelp}</div>
                 </div>
                 <br />
@@ -42,11 +42,11 @@
                 <div>
                     <br />
                     <paper-input id="txtMovieRecordingPath" label="${LabelMovieRecordingPath}" style="width:84%;display:inline-block;"></paper-input>
-                    <button type="button" is="paper-icon-button-light" id="btnSelectMovieRecordingPath" title="${ButtonSelectDirectory}"><iron-icon icon="search"></iron-icon></button>
+                    <button type="button" is="paper-icon-button-light" id="btnSelectMovieRecordingPath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
                 </div>
                 <div>
                     <paper-input id="txtSeriesRecordingPath" label="${LabelSeriesRecordingPath}" style="width:84%;display:inline-block;"></paper-input>
-                    <button type="button" is="paper-icon-button-light" id="btnSelectSeriesRecordingPath" title="${ButtonSelectDirectory}"><iron-icon icon="search"></iron-icon></button>
+                    <button type="button" is="paper-icon-button-light" id="btnSelectSeriesRecordingPath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
                 </div>
                 <br />
                 <div>
@@ -79,7 +79,7 @@
                 <br />
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                        <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                     </li>
                 </ul>
             </form>
diff --git a/dashboard-ui/livetvstatus.html b/dashboard-ui/livetvstatus.html
index 7fca9fcf28..a687598a5a 100644
--- a/dashboard-ui/livetvstatus.html
+++ b/dashboard-ui/livetvstatus.html
@@ -10,7 +10,7 @@
                     <div>
                         <h1 style="display:inline-block;vertical-align:middle;">${HeaderTunerDevices}</h1>
                         <button is="emby-button" type="button" class="raised btnAddDevice submit mini" style="margin-left:1em;" title="${ButtonAdd}">
-                            <iron-icon icon="add"></iron-icon>
+                            <i class="md-icon">add</i>
                             <span>${ButtonAdd}</span>
                         </button>
                     </div>
@@ -22,7 +22,7 @@
                         <div>
                             <h1 style="display:inline-block;vertical-align:middle;">${HeaderGuideProviders}</h1>
                             <button is="emby-button" type="button" class="raised btnAddProvider submit mini" style="margin-left:1em;" title="${ButtonAdd}">
-                                <iron-icon icon="add"></iron-icon>
+                                <i class="md-icon">add</i>
                                 <span>${ButtonAdd}</span>
                             </button>
                         </div>
diff --git a/dashboard-ui/livetvtunerprovider-hdhomerun.html b/dashboard-ui/livetvtunerprovider-hdhomerun.html
index 0982e9880b..fdbea4933d 100644
--- a/dashboard-ui/livetvtunerprovider-hdhomerun.html
+++ b/dashboard-ui/livetvtunerprovider-hdhomerun.html
@@ -31,8 +31,8 @@
                         <p>${DrmChannelsNotImported}</p>
                         <br />
                         <div>
-                            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
-                            <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
+                            <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                            <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
                         </div>
                     </div>
                 </form>
diff --git a/dashboard-ui/livetvtunerprovider-m3u.html b/dashboard-ui/livetvtunerprovider-m3u.html
index 940c77cb2a..8732377c17 100644
--- a/dashboard-ui/livetvtunerprovider-m3u.html
+++ b/dashboard-ui/livetvtunerprovider-m3u.html
@@ -11,12 +11,12 @@
                     <div>
                         <div>
                             <paper-input class="txtDevicePath" label="${LabelFileOrUrl}" required="required" style="width:85%;display:inline-block;"></paper-input>
-                            <button type="button" is="paper-icon-button-light" id="btnSelectPath" title="${ButtonSelectDirectory}"><iron-icon icon="search"></iron-icon></button>
+                            <button type="button" is="paper-icon-button-light" id="btnSelectPath" title="${ButtonSelectDirectory}" class="autoSize"><i class="md-icon">search</i></button>
                         </div>
                         <br />
                         <div>
-                            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
-                            <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
+                            <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                            <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
                         </div>
                     </div>
                 </form>
diff --git a/dashboard-ui/livetvtunerprovider-satip.html b/dashboard-ui/livetvtunerprovider-satip.html
index f1a73bb72c..cd3a93565f 100644
--- a/dashboard-ui/livetvtunerprovider-satip.html
+++ b/dashboard-ui/livetvtunerprovider-satip.html
@@ -61,8 +61,8 @@
                         </div>
                         <br /><br />
                         <div>
-                            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
-                            <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
+                            <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
+                            <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
                         </div>
                     </div>
                 </form>
diff --git a/dashboard-ui/metadata.html b/dashboard-ui/metadata.html
index 8c5a7dab8d..a391dae57f 100644
--- a/dashboard-ui/metadata.html
+++ b/dashboard-ui/metadata.html
@@ -29,7 +29,7 @@
                         <select name="selectCountry" id="selectCountry" data-mini="true" required="required"></select>
                     </li>
                     <li>
-                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                        <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                     </li>
                 </ul>
             </form>
diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html
index 473eeea010..814f210751 100644
--- a/dashboard-ui/metadataimages.html
+++ b/dashboard-ui/metadataimages.html
@@ -64,7 +64,7 @@
                     <br />
                     <ul data-role="listview" class="ulForm">
                         <li>
-                            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                            <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                         </li>
                     </ul>
                 </form>
diff --git a/dashboard-ui/metadatanfo.html b/dashboard-ui/metadatanfo.html
index 9543e577b7..2ddf31da34 100644
--- a/dashboard-ui/metadatanfo.html
+++ b/dashboard-ui/metadatanfo.html
@@ -42,7 +42,7 @@
                 <br />
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                        <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                     </li>
                 </ul>
             </form>
diff --git a/dashboard-ui/metadatasubtitles.html b/dashboard-ui/metadatasubtitles.html
index 1f58f7a0bb..de7b08cfc7 100644
--- a/dashboard-ui/metadatasubtitles.html
+++ b/dashboard-ui/metadatasubtitles.html
@@ -45,7 +45,7 @@
                 </ul>
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                        <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                     </li>
                 </ul>
             </form>
diff --git a/dashboard-ui/myprofile.html b/dashboard-ui/myprofile.html
index 055193c743..b748d46e8d 100644
--- a/dashboard-ui/myprofile.html
+++ b/dashboard-ui/myprofile.html
@@ -58,7 +58,7 @@
                     <input is="emby-input" type="password" id="txtNewPasswordConfirm" label="${LabelNewPasswordConfirm}" autocomplete="off" />
                 </div>
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                     <button is="emby-button" type="button" id="btnResetPassword" class="raised cancel block hide"><iron-icon icon="lock"></iron-icon><span>${ButtonResetPassword}</span></button>
                 </div>
             </div>
@@ -82,7 +82,7 @@
                     <div class="fieldDescription checkboxFieldDescription">${LabelInNetworkSignInWithEasyPasswordHelp}</div>
                 </div>
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                     <button is="emby-button" type="button" id="btnResetEasyPassword" class="raised cancel block hide"><iron-icon icon="lock"></iron-icon><span>${ButtonResetEasyPassword}</span></button>
                 </div>
             </div>
diff --git a/dashboard-ui/notificationsetting.html b/dashboard-ui/notificationsetting.html
index 637af7ccd4..b528092648 100644
--- a/dashboard-ui/notificationsetting.html
+++ b/dashboard-ui/notificationsetting.html
@@ -59,9 +59,9 @@
                     </li>
                     <li>
                         <br />
-                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                        <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
-                        <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
+                        <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
                     </li>
 
                 </ul>
diff --git a/dashboard-ui/playbackconfiguration.html b/dashboard-ui/playbackconfiguration.html
index 129c8ff9c6..4e05d24a9d 100644
--- a/dashboard-ui/playbackconfiguration.html
+++ b/dashboard-ui/playbackconfiguration.html
@@ -27,7 +27,7 @@
                 <br />
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                        <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                     </li>
 
                 </ul>
diff --git a/dashboard-ui/scheduledtask.html b/dashboard-ui/scheduledtask.html
index ee45541463..ae6b51eaaf 100644
--- a/dashboard-ui/scheduledtask.html
+++ b/dashboard-ui/scheduledtask.html
@@ -11,7 +11,7 @@
                         ${HeaderTaskTriggers}
                     </h1>
                     <button is="emby-button" type="button" class="raised btnInvite submit mini" style="margin-left: 1em;" title="${ButtonAddScheduledTaskTrigger}" onclick="ScheduledTaskPage.showAddTriggerPopup();">
-                        <iron-icon icon="add"></iron-icon>
+                        <i class="md-icon">add</i>
                         <span>${ButtonAdd}</span>
                     </button>
                 </div>
diff --git a/dashboard-ui/scripts/medialibrarypage.js b/dashboard-ui/scripts/medialibrarypage.js
index bded8eafba..5a8cc4d120 100644
--- a/dashboard-ui/scripts/medialibrarypage.js
+++ b/dashboard-ui/scripts/medialibrarypage.js
@@ -1,4 +1,4 @@
-define(['jQuery', 'emby-icons'], function ($) {
+define(['jQuery', 'apphost'], function ($, appHost) {
 
     function changeCollectionType(page, virtualFolder) {
 
@@ -112,7 +112,7 @@
         menuItems.push({
             name: Globalize.translate('ButtonManageFolders'),
             id: 'edit',
-            ironIcon: 'folder-open'
+            ironIcon: 'folder_open'
         });
 
         menuItems.push({
@@ -124,7 +124,7 @@
         menuItems.push({
             name: Globalize.translate('ButtonRename'),
             id: 'rename',
-            ironIcon: 'mode-edit'
+            ironIcon: 'mode_edit'
         });
 
         require(['actionsheet'], function (actionsheet) {
@@ -180,7 +180,7 @@
 
         virtualFolders.push({
             Name: Globalize.translate('ButtonAddMediaLibrary'),
-            icon: 'add-circle',
+            icon: 'add_circle',
             Locations: [],
             showType: false,
             showLocations: false,
@@ -313,7 +313,7 @@
             html += '<div class="cardImage editLibrary" style="cursor:pointer;background-image:url(\'' + imgUrl + '\');"></div>';
         } else if (!virtualFolder.showNameWithIcon) {
             html += '<div class="cardImage editLibrary iconCardImage" style="cursor:pointer;">';
-            html += '<iron-icon icon="' + (virtualFolder.icon || getIcon(virtualFolder.CollectionType)) + '"></iron-icon>';
+            html += '<i class="md-icon">' + (virtualFolder.icon || getIcon(virtualFolder.CollectionType)) + '</i>';
 
             html += '</div>';
         }
@@ -328,7 +328,7 @@
             html += '<h1 class="cardImage iconCardImage addLibrary" style="position:absolute;top:0;left:0;right:0;bottom:0;cursor:pointer;">';
 
             html += '<div>';
-            html += '<iron-icon icon="' + (virtualFolder.icon || getIcon(virtualFolder.CollectionType)) + '" style="width:45%;height:45%;color:#888;"></iron-icon>';
+            html += '<i class="md-icon" style="font-size:400%;color:#888;">' + (virtualFolder.icon || getIcon(virtualFolder.CollectionType)) + '</i>';
 
             if (virtualFolder.showNameWithIcon) {
                 html += '<div style="margin:1.5em 0;position:width:100%;font-weight:500;color:#444;">';
@@ -343,8 +343,10 @@
         html += '<div class="cardFooter">';
 
         if (virtualFolder.showMenu !== false) {
+            var moreIcon = appHost.moreIcon == 'dots-horiz' ? '&#xE5D3;' : '&#xE5D4;';
+
             html += '<div class="cardText" style="text-align:right; float:right;padding-top:5px;">';
-            html += '<button type="button" is="paper-icon-button-light" class="btnCardMenu"><iron-icon icon="' + AppInfo.moreIcon + '"></iron-icon></button>';
+            html += '<button type="button" is="paper-icon-button-light" class="btnCardMenu autoSize"><i class="md-icon">' + moreIcon + '</i></button>';
             html += "</div>";
         }
 
diff --git a/dashboard-ui/scripts/sections.js b/dashboard-ui/scripts/sections.js
index 3d074002ce..5a18000c41 100644
--- a/dashboard-ui/scripts/sections.js
+++ b/dashboard-ui/scripts/sections.js
@@ -50,11 +50,11 @@
 
             switch (item.CollectionType) {
                 case "movies":
-                    icon = "local-movies";
+                    icon = "local_movies";
                     backgroundColor = 'rgba(176, 94, 81, 0.9)';
                     break;
                 case "music":
-                    icon = "library-music";
+                    icon = "library_music";
                     backgroundColor = 'rgba(217, 145, 67, 0.9)';
                     break;
                 case "photos":
@@ -62,11 +62,11 @@
                     backgroundColor = 'rgba(127, 0, 0, 0.9)';
                     break;
                 case "livetv":
-                    icon = "live-tv";
+                    icon = "live_tv";
                     backgroundColor = 'rgba(217, 145, 67, 0.9)';
                     break;
                 case "tvshows":
-                    icon = "live-tv";
+                    icon = "live_tv";
                     backgroundColor = 'rgba(77, 88, 164, 0.9)';
                     break;
                 case "games":
@@ -74,15 +74,15 @@
                     backgroundColor = 'rgba(183, 202, 72, 0.9)';
                     break;
                 case "trailers":
-                    icon = "local-movies";
+                    icon = "local_movies";
                     backgroundColor = 'rgba(176, 94, 81, 0.9)';
                     break;
                 case "homevideos":
-                    icon = "video-library";
+                    icon = "video_library";
                     backgroundColor = 'rgba(110, 52, 32, 0.9)';
                     break;
                 case "musicvideos":
-                    icon = "video-library";
+                    icon = "video_library";
                     backgroundColor = 'rgba(143, 54, 168, 0.9)';
                     break;
                 case "books":
@@ -115,7 +115,7 @@
             html += '<div class="cardBox" style="background-color:' + backgroundColor + ';margin:4px;border-radius:4px;">';
 
             html += "<div class='cardText' style='padding:8px 10px;color:#fff;'>";
-            html += '<iron-icon icon="' + icon + '"></iron-icon>';
+            html += '<i class="md-icon">' + icon + '</i>';
             html += '<span style="margin-left:.7em;">' + item.Name + '</span>';
             html += "</div>";
 
@@ -228,7 +228,7 @@
 
         var html = '';
         html += '<div>';
-        html += '<h1>Try Emby Theater<button is="paper-icon-button-light" style="margin-left:1em;" onclick="this.parentNode.parentNode.remove();"><iron-icon icon="close"></iron-icon></button></h1>';
+        html += '<h1>Try Emby Theater<button is="paper-icon-button-light" style="margin-left:1em;" onclick="this.parentNode.parentNode.remove();" class="autoSize"><i class="md-icon">close</i></button></h1>';
 
         var nameText = AppInfo.isNativeApp ? 'Emby Theater' : '<a href="https://emby.media/download" target="_blank">Emby Theater</a>';
         html += '<p>A beautiful app for your TV and large screen tablet. ' + nameText + ' runs on Windows, Xbox One, Google Chrome, FireFox, Microsoft Edge and Opera.</p>';
@@ -246,7 +246,7 @@
 
         var html = '';
         html += '<div>';
-        html += '<h1>Try Emby Premiere<button is="paper-icon-button-light" style="margin-left:1em;" onclick="this.parentNode.parentNode.remove();"><iron-icon icon="close"></iron-icon></button></h1>';
+        html += '<h1>Try Emby Premiere<button is="paper-icon-button-light" style="margin-left:1em;" onclick="this.parentNode.parentNode.remove();" class="autoSize"><i class="md-icon">close</i></button></h1>';
 
         var cardTarget = AppInfo.isNativeApp ? '' : 'https://emby.media/premiere';
         var learnMoreText = AppInfo.isNativeApp ? '' : '<a href="https://emby.media/premiere" target="_blank">Learn more</a>';
@@ -265,7 +265,7 @@
     function getUpgradeMobileLayoutsInfo() {
         var html = '';
         html += '<div>';
-        html += '<h1>Unlock Improved Layouts with Emby Premiere<button is="paper-icon-button-light" style="margin-left:1em;" onclick="this.parentNode.parentNode.remove();"><iron-icon icon="close"></iron-icon></button></h1>';
+        html += '<h1>Unlock Improved Layouts with Emby Premiere<button is="paper-icon-button-light" style="margin-left:1em;" onclick="this.parentNode.parentNode.remove();" class="autoSize"><i class="md-icon">close</i></button></h1>';
 
         var cardTarget = AppInfo.isNativeApp ? '' : 'https://emby.media/premiere';
         var learnMoreText = AppInfo.isNativeApp ? '' : '<a href="https://emby.media/premiere" target="_blank">Learn more</a>';
diff --git a/dashboard-ui/serversecurity.html b/dashboard-ui/serversecurity.html
index bc840e8f83..63bbcad066 100644
--- a/dashboard-ui/serversecurity.html
+++ b/dashboard-ui/serversecurity.html
@@ -6,7 +6,7 @@
                     ${HeaderApiKeys}
                 </h3>
                 <button is="emby-button" type="button" class="raised btnNewKey submit mini" style="margin-left:1em;" title="${ButtonNew}">
-                    <iron-icon icon="add"></iron-icon>
+                    <i class="md-icon">add</i>
                     <span>${ButtonAdd}</span>
                 </button>
             </div>
diff --git a/dashboard-ui/streamingsettings.html b/dashboard-ui/streamingsettings.html
index 29e7d5b012..c0a78a6820 100644
--- a/dashboard-ui/streamingsettings.html
+++ b/dashboard-ui/streamingsettings.html
@@ -18,7 +18,7 @@
                     </select>
                     <div class="fieldDescription">${LabelChannelStreamQualityHelp}</div>
                 </div>
-                <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
             </form>
         </div>
     </div>
diff --git a/dashboard-ui/supporterkey.html b/dashboard-ui/supporterkey.html
index 735d1a2e4f..ca810206ad 100644
--- a/dashboard-ui/supporterkey.html
+++ b/dashboard-ui/supporterkey.html
@@ -13,7 +13,7 @@
                     <div class="supporterContainer hide">
                         <br />
                         <a class="clearLink" href="http://emby.media/premiere" target="_blank">
-                            <button is="emby-button" type="button" class="raised block accent"><iron-icon icon="check"></iron-icon><span>${HeaderBecomeProjectSupporter}</span></button>
+                            <button is="emby-button" type="button" class="raised block accent"><i class="md-icon">check</i><span>${HeaderBecomeProjectSupporter}</span></button>
                         </a>
                     </div>
                 </div>
@@ -44,7 +44,7 @@
 
                     </div>
                     <p>
-                        <button is="emby-button" type="submit" id="mbLegacyKeyBtn" class="raised block submit"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                        <button is="emby-button" type="submit" id="mbLegacyKeyBtn" class="raised block submit"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                     </p>
                 </form>
                 <br />
@@ -56,7 +56,7 @@
                                 <div class="fieldDescription">${LabelSupporterEmailAddress}</div>
                             </div>
                             <p>
-                                <button is="emby-button" type="submit" id="mbRetrieveKeyBtn" class="raised block submit"><iron-icon icon="check"></iron-icon><span>${ButtonRetrieveKey}</span></button>
+                                <button is="emby-button" type="submit" id="mbRetrieveKeyBtn" class="raised block submit"><i class="md-icon">check</i><span>${ButtonRetrieveKey}</span></button>
                             </p>
                         </form>
                     </div>
@@ -81,7 +81,7 @@
                                 <input is="emby-input" type="password" required id="txtOldKey" label="${LabelOldSupporterKey}" />
                             </div>
                             <p>
-                                <button is="emby-button" type="submit" id="mbLinkKeysBtn" class="raised block submit"><iron-icon icon="check"></iron-icon><span>${ButtonLinkKeys}</span></button>
+                                <button is="emby-button" type="submit" id="mbLinkKeysBtn" class="raised block submit"><i class="md-icon">check</i><span>${ButtonLinkKeys}</span></button>
                             </p>
                         </form>
                     </div>
diff --git a/dashboard-ui/useredit.html b/dashboard-ui/useredit.html
index 04b8ef3a35..79995da83f 100644
--- a/dashboard-ui/useredit.html
+++ b/dashboard-ui/useredit.html
@@ -106,9 +106,9 @@
                 </div>
                 <br />
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
-                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
+                    <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/userlibraryaccess.html b/dashboard-ui/userlibraryaccess.html
index f6721f4f59..9c8f833510 100644
--- a/dashboard-ui/userlibraryaccess.html
+++ b/dashboard-ui/userlibraryaccess.html
@@ -52,9 +52,9 @@
                 <br />
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                        <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
-                        <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
+                        <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
                     </li>
                 </ul>
             </form>
diff --git a/dashboard-ui/usernew.html b/dashboard-ui/usernew.html
index 4c9fa8c8a0..faecd6d009 100644
--- a/dashboard-ui/usernew.html
+++ b/dashboard-ui/usernew.html
@@ -40,9 +40,9 @@
                 <br />
                 <ul data-role="listview" class="ulForm">
                     <li>
-                        <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                        <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
 
-                        <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></button>
+                        <button is="emby-button" type="button" class="raised cancel block btnCancel" onclick="history.back();"><i class="md-icon">close</i><span>${ButtonCancel}</span></button>
                     </li>
                 </ul>
             </form>
diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html
index da8b88b449..5ba90445ac 100644
--- a/dashboard-ui/userparentalcontrol.html
+++ b/dashboard-ui/userparentalcontrol.html
@@ -28,7 +28,7 @@
                     <div>
                         <h1 style="display:inline-block;vertical-align:middle;">${LabelBlockContentWithTags}</h1>
                         <button is="emby-button" type="button" class="raised btnAddBlockedTag submit mini" style="margin-left:1em;" title="${ButtonAdd}">
-                            <iron-icon icon="add"></iron-icon>
+                            <i class="md-icon">add</i>
                             <span>${ButtonAdd}</span>
                         </button>
                     </div>
@@ -53,7 +53,7 @@
                     <br />
                 </div>
                 <div>
-                    <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                    <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                 </div>
 
             </form>
diff --git a/dashboard-ui/userpassword.html b/dashboard-ui/userpassword.html
index 4ebf177666..23d8fc88a2 100644
--- a/dashboard-ui/userpassword.html
+++ b/dashboard-ui/userpassword.html
@@ -30,7 +30,7 @@
                         </div>
                         <br />
                         <div>
-                            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                            <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                             <button is="emby-button" type="button" id="btnResetPassword" class="raised cancel block hide"><iron-icon icon="lock"></iron-icon><span>${ButtonResetPassword}</span></button>
                         </div>
                     </div>
@@ -56,7 +56,7 @@
                             <div class="fieldDescription checkboxFieldDescription">${LabelInNetworkSignInWithEasyPasswordHelp}</div>
                         </div>
                         <div>
-                            <button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>
+                            <button is="emby-button" type="submit" class="raised submit block"><i class="md-icon">check</i><span>${ButtonSave}</span></button>
                             <button is="emby-button" type="button" id="btnResetEasyPassword" class="raised cancel block hide"><iron-icon icon="lock"></iron-icon><span>${ButtonResetEasyPassword}</span></button>
                         </div>
                     </div>
diff --git a/dashboard-ui/userprofiles.html b/dashboard-ui/userprofiles.html
index 9eaeec4831..bc5eb158d7 100644
--- a/dashboard-ui/userprofiles.html
+++ b/dashboard-ui/userprofiles.html
@@ -7,7 +7,7 @@
                     <span style="vertical-align:middle;">${HeaderUsers}</span>
                 </h3>
                 <button is="emby-button" type="button" class="raised btnAddUser submit mini" style="margin-left:1em;" title="${ButtonAddUser}">
-                    <iron-icon icon="add"></iron-icon>
+                    <i class="md-icon">add</i>
                     <span>${ButtonAdd}</span>
                 </button>
             </div>
@@ -18,7 +18,7 @@
                     ${HeaderGuests}
                 </h3>
                 <button is="emby-button" type="button" class="raised btnInvite submit mini" style="margin-left:1em;" title="${ButtonInviteUser}">
-                    <iron-icon icon="add"></iron-icon>
+                    <i class="md-icon">add</i>
                     <span>${ButtonAdd}</span>
                 </button>
             </div>
diff --git a/dashboard-ui/wizardagreement.html b/dashboard-ui/wizardagreement.html
index c961dabdfe..c93ac2fd52 100644
--- a/dashboard-ui/wizardagreement.html
+++ b/dashboard-ui/wizardagreement.html
@@ -18,8 +18,14 @@
                 </div>
 
                 <div class="wizardNavigation">
-                    <button is="emby-button" type="button" onclick="history.back();" class="raised subdued"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></button>
-                    <button is="emby-button" type="submit" class="raised raised accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></button>
+                    <button is="emby-button" type="button" onclick="history.back();" class="raised subdued">
+                        <i class="md-icon">arrow_back</i>
+                        <span>${LabelPrevious}</span>
+                    </button>
+                    <button is="emby-button" type="submit" class="raised raised accent">
+                        <span>${LabelNext}</span>
+                        <i class="md-icon">arrow_forward</i>
+                    </button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/wizardcomponents.html b/dashboard-ui/wizardcomponents.html
index 7d701bd025..0359e6ccf6 100644
--- a/dashboard-ui/wizardcomponents.html
+++ b/dashboard-ui/wizardcomponents.html
@@ -51,8 +51,14 @@
                 </div>
 
                 <div class="wizardNavigation">
-                    <button is="emby-button" type="button" onclick="history.back();" class="raised subdued"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></button>
-                    <button is="emby-button" type="submit" class="raised raised accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></button>
+                    <button is="emby-button" type="button" onclick="history.back();" class="raised subdued">
+                        <i class="md-icon">arrow_back</i>
+                        <span>${LabelPrevious}</span>
+                    </button>
+                    <button is="emby-button" type="submit" class="raised raised accent">
+                        <span>${LabelNext}</span>
+                        <i class="md-icon">arrow_forward</i>
+                    </button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/wizardfinish.html b/dashboard-ui/wizardfinish.html
index cf4621b546..699d00d2a0 100644
--- a/dashboard-ui/wizardfinish.html
+++ b/dashboard-ui/wizardfinish.html
@@ -37,8 +37,8 @@
             </p>
 
             <div class="wizardNavigation">
-                <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></button>
-                <button is="emby-button" type="button" class="raised btnWizardNext accent"><iron-icon icon="check"></iron-icon><span>${LabelFinish}</span></button>
+                <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
+                <button is="emby-button" type="button" class="raised btnWizardNext accent"><i class="md-icon">check</i><span>${LabelFinish}</span></button>
             </div>
         </div>
 
diff --git a/dashboard-ui/wizardlibrary.html b/dashboard-ui/wizardlibrary.html
index 3aba37790a..2ba2578fac 100644
--- a/dashboard-ui/wizardlibrary.html
+++ b/dashboard-ui/wizardlibrary.html
@@ -16,8 +16,8 @@
             <br />
             <br />
             <div class="wizardNavigation">
-                <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></button>
-                <button is="emby-button" type="button" class="raised accent" onclick="WizardLibraryPage.next();"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></button>
+                <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
+                <button is="emby-button" type="button" class="raised accent" onclick="WizardLibraryPage.next();"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
             </div>
         </div>
 
diff --git a/dashboard-ui/wizardlivetvguide.html b/dashboard-ui/wizardlivetvguide.html
index f871dac182..9c6f8ef60d 100644
--- a/dashboard-ui/wizardlivetvguide.html
+++ b/dashboard-ui/wizardlivetvguide.html
@@ -27,8 +27,8 @@
             <br />
             <br />
             <div class="wizardNavigation">
-                <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></button>
-                <button is="emby-button" type="button" class="raised btnNext accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></button>
+                <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
+                <button is="emby-button" type="button" class="raised btnNext accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
                 <button is="emby-button" type="button" class="raised btnSkip" style="background: #888; color: #fff;"><iron-icon icon="arrow-forward"></iron-icon><span>${ButtonSkip}</span></button>
             </div>
         </div>
diff --git a/dashboard-ui/wizardlivetvtuner.html b/dashboard-ui/wizardlivetvtuner.html
index 67c9b8289e..308314d52e 100644
--- a/dashboard-ui/wizardlivetvtuner.html
+++ b/dashboard-ui/wizardlivetvtuner.html
@@ -28,8 +28,8 @@
                 <br />
                 <br />
                 <div class="wizardNavigation">
-                    <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></button>
-                    <button is="emby-button" type="submit" class="raised accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></button>
+                    <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
+                    <button is="emby-button" type="submit" class="raised accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
                     <button is="emby-button" type="button" class="btnSkip raised" style="background: #888; color: #fff;"><iron-icon icon="arrow-forward"></iron-icon><span>${ButtonSkip}</span></button>
                 </div>
             </form>
diff --git a/dashboard-ui/wizardservice.html b/dashboard-ui/wizardservice.html
index 4391754bdf..0d07194572 100644
--- a/dashboard-ui/wizardservice.html
+++ b/dashboard-ui/wizardservice.html
@@ -14,8 +14,8 @@
             <p>${WindowsServiceIntro2}</p>
 
             <div class="wizardNavigation">
-                <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></button>
-                <button is="emby-button" type="button" id="btnNextPage" class="raised accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></button>
+                <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
+                <button is="emby-button" type="button" id="btnNextPage" class="raised accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
             </div>
         </div>
 
diff --git a/dashboard-ui/wizardsettings.html b/dashboard-ui/wizardsettings.html
index bbcaee8a50..7ce1652c95 100644
--- a/dashboard-ui/wizardsettings.html
+++ b/dashboard-ui/wizardsettings.html
@@ -29,8 +29,8 @@
                 </div>
 
                 <div class="wizardNavigation">
-                    <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></button>
-                    <button is="emby-button" type="submit" class="raised accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></button>
+                    <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
+                    <button is="emby-button" type="submit" class="raised accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/wizardstart.html b/dashboard-ui/wizardstart.html
index 9f5a6e293d..395167dae4 100644
--- a/dashboard-ui/wizardstart.html
+++ b/dashboard-ui/wizardstart.html
@@ -22,7 +22,7 @@
                 <br />
 
                 <div class="wizardNavigation" style="text-align:right;">
-                    <button is="emby-button" type="submit" class="raised accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></button>
+                    <button is="emby-button" type="submit" class="raised accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
                 </div>
             </form>
         </div>
diff --git a/dashboard-ui/wizarduser.html b/dashboard-ui/wizarduser.html
index 20b952ba6e..962d0deb71 100644
--- a/dashboard-ui/wizarduser.html
+++ b/dashboard-ui/wizarduser.html
@@ -24,8 +24,8 @@
                 </div>
                 <br />
                 <div class="wizardNavigation">
-                    <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><iron-icon icon="arrow-back"></iron-icon><span>${LabelPrevious}</span></button>
-                    <button is="emby-button" type="submit" class="raised accent"><iron-icon icon="arrow-forward"></iron-icon><span>${LabelNext}</span></button>
+                    <button is="emby-button" type="button" class="raised subdued" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
+                    <button is="emby-button" type="submit" class="raised accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
                 </div>
             </form>
         </div>