diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index dca0679f0..47d61ee6b 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -181,7 +181,7 @@
           <md-icon>delete</md-icon>
         </md-button>
         <md-button class="sg-icon-button" ng-click="mailbox.markOrUnMarkMessagesAsJunk()">
-          <md-icon ng-hide="::mailbox.service.selectedFolder.type == 'junk'">whatshot</md-icon>
+          <md-icon ng-hide="::mailbox.service.selectedFolder.type == 'junk'">gpp_bad</md-icon>
 	  <md-tooltip ng-hide="::mailbox.service.selectedFolder.type == 'junk'" md-direction="bottom"><var:string label:value="Junk"/></md-tooltip>	
           <md-icon ng-hide="::mailbox.service.selectedFolder.type != 'junk'">thumb_up</md-icon>
 	  <md-tooltip ng-hide="::mailbox.service.selectedFolder.type != 'junk'" md-direction="bottom"><var:string label:value="Not junk"/></md-tooltip>
diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index a963453b9..7caf312ce 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -50,7 +50,7 @@
                      ng-click="viewer.markOrUnMarkAsJunk()">
             <md-tooltip md-direction="bottom" ng-hide="::viewer.mailbox.type == 'junk'"><var:string label:value="Junk"/></md-tooltip>
             <md-tooltip md-direction="bottom" ng-show="::viewer.mailbox.type == 'junk'"><var:string label:value="Not junk"/></md-tooltip>
-            <md-icon ng-hide="::viewer.mailbox.type == 'junk'">whatshot</md-icon>
+            <md-icon ng-hide="::viewer.mailbox.type == 'junk'">gpp_bad</md-icon>
             <md-icon ng-show="::viewer.mailbox.type == 'junk'">thumb_up</md-icon>
           </md-button>
           <md-button class="sg-icon-button"
diff --git a/UI/WebServerResources/fonts/MaterialIcons-Regular.eot b/UI/WebServerResources/fonts/MaterialIcons-Regular.eot
deleted file mode 100644
index 17b6f7235..000000000
Binary files a/UI/WebServerResources/fonts/MaterialIcons-Regular.eot and /dev/null differ
diff --git a/UI/WebServerResources/fonts/MaterialIcons-Regular.ttf b/UI/WebServerResources/fonts/MaterialIcons-Regular.ttf
index 8f0797874..9d09b0feb 100644
Binary files a/UI/WebServerResources/fonts/MaterialIcons-Regular.ttf and b/UI/WebServerResources/fonts/MaterialIcons-Regular.ttf differ
diff --git a/UI/WebServerResources/fonts/MaterialIcons-Regular.woff b/UI/WebServerResources/fonts/MaterialIcons-Regular.woff
index d1c81db61..9f9971b33 100644
Binary files a/UI/WebServerResources/fonts/MaterialIcons-Regular.woff and b/UI/WebServerResources/fonts/MaterialIcons-Regular.woff differ
diff --git a/UI/WebServerResources/fonts/MaterialIcons-Regular.woff2 b/UI/WebServerResources/fonts/MaterialIcons-Regular.woff2
index d9c6038f7..b85708e81 100644
Binary files a/UI/WebServerResources/fonts/MaterialIcons-Regular.woff2 and b/UI/WebServerResources/fonts/MaterialIcons-Regular.woff2 differ
diff --git a/UI/WebServerResources/js/Mailer/Mailbox.service.js b/UI/WebServerResources/js/Mailer/Mailbox.service.js
index 1aa6bbc9a..91596f7c5 100644
--- a/UI/WebServerResources/js/Mailer/Mailbox.service.js
+++ b/UI/WebServerResources/js/Mailer/Mailbox.service.js
@@ -207,7 +207,7 @@
       }
       else if (this.type == 'junk') {
         this.$displayName = l('JunkFolderName');
-        this.$icon = 'thumb_down';
+        this.$icon = 'gpp_bad';
       }
       else if (this.type == 'templates') {
         this.$displayName = l('TemplatesFolderName');
diff --git a/UI/WebServerResources/scss/components/icon/icon.scss b/UI/WebServerResources/scss/components/icon/icon.scss
index 61982f365..840bccd04 100644
--- a/UI/WebServerResources/scss/components/icon/icon.scss
+++ b/UI/WebServerResources/scss/components/icon/icon.scss
@@ -11,10 +11,9 @@ $icon-badge-size: 2 * $baseline-grid;
   font-family: 'Material Icons';
   font-style: normal;
   font-weight: 400;
-  src: url('../fonts/MaterialIcons-Regular.eot'); /* For IE6-8 */
-  src: local('Material Icons'),
-       local('MaterialIcons-Regular'),
-       url('../fonts/MaterialIcons-Regular.woff2') format('woff2'),
+  /* No local() sources: always use the bundled font so an outdated
+     Material Icons font installed on the OS can't shadow it. */
+  src: url('../fonts/MaterialIcons-Regular.woff2') format('woff2'),
        url('../fonts/MaterialIcons-Regular.woff') format('woff'),
        url('../fonts/MaterialIcons-Regular.ttf') format('truetype');
 }