diff --git a/dashboard-ui/css/dashboard.css b/dashboard-ui/css/dashboard.css
index 7878b7aace..03360cc097 100644
--- a/dashboard-ui/css/dashboard.css
+++ b/dashboard-ui/css/dashboard.css
@@ -3,11 +3,6 @@
     margin-left: 0;
 }
 
-iron-icon {
-    min-width: 24px;
-    min-height: 24px;
-}
-
 .paperCheckboxFieldDescription {
     padding-left: 31px;
     padding-top: 5px;
diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css
index 2ec9c591b8..bf7e7ee561 100644
--- a/dashboard-ui/css/site.css
+++ b/dashboard-ui/css/site.css
@@ -7,24 +7,6 @@
     contain: layout style;
 }
 
-.emby-button.fab iron-icon {
-    width: 100%;
-    height: 100%;
-    vertical-align: middle;
-}
-
-.emby-button iron-icon + span {
-    margin-left: .5em;
-}
-
-.paper-icon-button-light > iron-icon {
-    width: 100%;
-    height: 100%;
-    /* Make sure its on top of the ripple */
-    position: relative;
-    z-index: 1;
-    vertical-align: middle;
-}
 /* Links */
 .ui-body-b a {
     color: #52B54B /*{b-link-color}*/;
diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html
index 9470b1a196..7599ab9e12 100644
--- a/dashboard-ui/dashboard.html
+++ b/dashboard-ui/dashboard.html
@@ -21,7 +21,7 @@
                             <p id="appVersionNumber">
                             </p>
                             <p id="pUpToDate" style="display: flex; align-items:center;" class="hide">
-                                <iron-icon icon="check" style="background-color: #52B54B;border-radius:.25em;color: #fff;margin-right:.5em;"></iron-icon>
+                                <i class="md-icon" style="background-color: #52B54B;border-radius:.25em;color: #fff;margin-right:.5em;padding:.25em;font-size:110%;">check</i>
                                 ${ServerUpToDate}
                             </p>
                             <div id="pUpdateNow" style="display: none;">
@@ -41,8 +41,14 @@
                             <p class="externalUrl"></p>
 
                             <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();"><i class="md-icon">close</i><span>${ButtonShutdown}</span></button>
+                                <button is="emby-button" type="button" class="raised subdued btnRestartContainer hide" onclick="DashboardPage.restart();">
+                                    <i class="md-icon">refresh</i>
+                                    <span>${ButtonRestart}</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>
@@ -58,7 +64,10 @@
                                 </div>
                                 <p>${MessagePleaseRestartServerToFinishUpdating}</p>
                                 <div class="btnRestartContainer hide">
-                                    <button is="emby-button" type="button" class="raised submit" onclick="DashboardPage.restart();"><iron-icon icon="refresh"></iron-icon><span>${ButtonRestartNow}</span></button>
+                                    <button is="emby-button" type="button" class="raised submit" onclick="DashboardPage.restart();">
+                                        <i class="md-icon">refresh</i>
+                                        <span>${ButtonRestartNow}</span>
+                                    </button>
                                 </div>
                             </div>
                         </div>
@@ -67,7 +76,9 @@
                     <div class="healthMonitorSection hide" style="margin-top: 2em;">
                         <h1 style="display:flex;align-items:center;">
                             <div>${HeaderHealthMonitor}</div>
-                            <button is="paper-icon-button-light" type="button" style="margin-left:.5em;"><iron-icon icon="refresh"></iron-icon></button>
+                            <button is="paper-icon-button-light" type="button" style="margin-left: .5em;">
+                                <i class="md-icon">refresh</i>
+                            </button>
                         </h1>
                         <div class="healthMonitor paperList">
                         </div>
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index b97fb5cc0e..66bef84dfd 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -100,12 +100,6 @@ button.emby-button span {
     vertical-align: middle;
 }
 
-button.emby-button.iconRight iron-icon {
-    position: absolute;
-    right: 5px;
-    top: 5px;
-}
-
 .clearButton {
     background: transparent;
     border: 0;
@@ -130,21 +124,12 @@ button.emby-button.mini:not(.fab) {
     padding: 0.4em 0.7em;
 }
 
-    button.emby-button.mini:not(.fab) iron-icon {
-        height: 20px;
-        width: 20px;
-    }
-
 button.emby-button.notext {
     min-width: 2.8em;
     padding-left: .25em !important;
     padding-right: .25em !important;
 }
 
-    button.emby-button.notext iron-icon {
-        margin-right: 0;
-    }
-
 .fab.green {
     background-color: #81c784 !important;
 }
@@ -209,4 +194,4 @@ div.dialogHeader {
 
 .formDialog.background-theme-b {
     background-color: #181818;
-}
\ No newline at end of file
+}