diff --git a/dashboard-ui/autoorganizelog.html b/dashboard-ui/autoorganizelog.html
index e8d9433b8d..fc0240668e 100644
--- a/dashboard-ui/autoorganizelog.html
+++ b/dashboard-ui/autoorganizelog.html
@@ -5,7 +5,9 @@
             <div>
 
                 <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="btnClearLog raised subdued">
+                        <i class="md-icon">clear_all</i><span>${ButtonClear}</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>
diff --git a/dashboard-ui/scripts/dashboardpage.js b/dashboard-ui/scripts/dashboardpage.js
index 23cae35da2..7760fae355 100644
--- a/dashboard-ui/scripts/dashboardpage.js
+++ b/dashboard-ui/scripts/dashboardpage.js
@@ -779,7 +779,7 @@
 
                     html += "<span style='color:#009F00;margin-left:5px;margin-right:5px;'>" + progress + "%</span>";
 
-                    html += '<button type="button" is="paper-icon-button-light" title="' + Globalize.translate('ButtonStop') + '" onclick="DashboardPage.stopTask(\'' + task.Id + '\');"><iron-icon icon="cancel"></iron-icon></button>';
+                    html += '<button type="button" is="paper-icon-button-light" title="' + Globalize.translate('ButtonStop') + '" onclick="DashboardPage.stopTask(\'' + task.Id + '\');" class="autoSize"><i class="md-icon">cancel</i></button>';
                 }
                 else if (task.State == "Cancelling") {
                     html += '<span style="color:#cc0000;">' + Globalize.translate('LabelStopping') + '</span>';
diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js
index 3d0e5bc8d1..fea7b04af7 100644
--- a/dashboard-ui/scripts/site.js
+++ b/dashboard-ui/scripts/site.js
@@ -839,7 +839,7 @@
             html += '</progress>';
 
             if (percentComplete < 100) {
-                html += '<button is="emby-button" type="button" class="raised cancelDark mini" onclick="this.disabled=\'disabled\';Dashboard.cancelInstallation(\'' + installation.Id + '\');"><iron-icon icon="cancel"></iron-icon><span>' + Globalize.translate('ButtonCancel') + '</span></button>';
+                html += '<button is="emby-button" type="button" class="raised cancelDark mini" onclick="this.disabled=\'disabled\';Dashboard.cancelInstallation(\'' + installation.Id + '\');"><i class="md-icon">cancel</i><span>' + Globalize.translate('ButtonCancel') + '</span></button>';
             }
         }
 
diff --git a/dashboard-ui/wizardlibrary.html b/dashboard-ui/wizardlibrary.html
index 2ba2578fac..1dab98491f 100644
--- a/dashboard-ui/wizardlibrary.html
+++ b/dashboard-ui/wizardlibrary.html
@@ -8,7 +8,7 @@
                 <h1 style="display:inline-block;">
                     ${HeaderSetupLibrary}
                 </h1>
-                <a href="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" 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 secondary mini"><iron-icon icon="info"></iron-icon><span>${ButtonHelp}</span></button></a>
+                <a href="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" 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 secondary mini"><i class="md-icon">info</i><span>${ButtonHelp}</span></button></a>
             </div>
 
             <br />
diff --git a/dashboard-ui/wizardlivetvguide.html b/dashboard-ui/wizardlivetvguide.html
index a0b020b289..87d9457f1f 100644
--- a/dashboard-ui/wizardlivetvguide.html
+++ b/dashboard-ui/wizardlivetvguide.html
@@ -8,7 +8,7 @@
                 <h1 style="display:inline-block;">
                     ${HeaderSetupTVGuide}
                 </h1>
-                <a href="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" 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 secondary mini"><iron-icon icon="info"></iron-icon><span>${ButtonHelp}</span></button></a>
+                <a href="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" 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 secondary mini"><i class="md-icon">info</i><span>${ButtonHelp}</span></button></a>
             </div>
 
             <br />
diff --git a/dashboard-ui/wizardlivetvtuner.html b/dashboard-ui/wizardlivetvtuner.html
index a7b99aede1..74106b8a83 100644
--- a/dashboard-ui/wizardlivetvtuner.html
+++ b/dashboard-ui/wizardlivetvtuner.html
@@ -9,7 +9,7 @@
                     <h1 style="display:inline-block;">
                         ${HeaderSetupLiveTV}
                     </h1>
-                    <a href="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" 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 secondary mini"><iron-icon icon="info"></iron-icon><span>${ButtonHelp}</span></button></a>
+                    <a href="https://github.com/MediaBrowser/Wiki/wiki/Live%20TV" 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 secondary mini"><i class="md-icon">info</i><span>${ButtonHelp}</span></button></a>
                 </div>
 
                 <br />
diff --git a/dashboard-ui/wizardstart.html b/dashboard-ui/wizardstart.html
index 395167dae4..63b52d69b0 100644
--- a/dashboard-ui/wizardstart.html
+++ b/dashboard-ui/wizardstart.html
@@ -9,7 +9,7 @@
                     <h1 style="float:left;">
                         ${WelcomeToProject}
                     </h1>
-                    <a href="https://github.com/MediaBrowser/Wiki/wiki/Quick%20start" target="_blank" class="clearLink" style="float:right;margin-top:20px;"><button is="emby-button" type="button" class="raised secondary mini"><iron-icon icon="info"></iron-icon><span>${ButtonQuickStartGuide}</span></button></a>
+                    <a href="https://github.com/MediaBrowser/Wiki/wiki/Quick%20start" target="_blank" class="clearLink" style="float:right;margin-top:20px;"><button is="emby-button" type="button" class="raised secondary mini"><i class="md-icon">info</i><span>${ButtonQuickStartGuide}</span></button></a>
                 </div>
 
                 <br style="clear:both;" />