diff --git a/.gitignore b/.gitignore
index 317c167d7..04a616227 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,12 +20,11 @@ UI/WebServerResources/bower_components/
 UI/WebServerResources/css/
 UI/WebServerResources/css/styles.css
 UI/WebServerResources/css/styles.css.map
-UI/WebServerResources/fonts/
-UI/WebServerResources/js/Common.js
-UI/WebServerResources/js/Contacts.js
-UI/WebServerResources/js/Mailer.js
-UI/WebServerResources/js/Preferences.js
-UI/WebServerResources/js/Scheduler.js
+UI/WebServerResources/js/Common.js*
+UI/WebServerResources/js/Contacts.js*
+UI/WebServerResources/js/Mailer.js*
+UI/WebServerResources/js/Preferences.js*
+UI/WebServerResources/js/Scheduler.js*
 UI/WebServerResources/js/vendor/
 UI/WebServerResources/node_modules/
 UI/WebServerResources/scss/.sass-cache/
diff --git a/UI/WebServerResources/Gruntfile.js b/UI/WebServerResources/Gruntfile.js
index 6327a4d71..73d428a40 100644
--- a/UI/WebServerResources/Gruntfile.js
+++ b/UI/WebServerResources/Gruntfile.js
@@ -51,7 +51,6 @@ module.exports = function(grunt) {
             require('autoprefixer-core')({browsers: '> 1%, last 2 versions, last 3 Firefox versions'})
           ]
           // We may consider using css grace (https://github.com/cssdream/cssgrace) for larger support
-
         },
         src: 'css/styles.css'
       }
@@ -122,9 +121,9 @@ module.exports = function(grunt) {
         grunt.log.ok("copy " + src + " => " + dest);
       }
     }
+    /*
     grunt.log.subhead('Copying font files');
     var fonts = [
-      '<%= src %>/material-design-iconic-font/fonts/Material-Design-Iconic-Font.*'
     ];
     for (var j = 0; j < fonts.length; j++) {
       var files = grunt.file.expand(grunt.template.process(fonts[j], {data: options}));
@@ -136,6 +135,7 @@ module.exports = function(grunt) {
         grunt.log.ok("copy " + src + " => " + dest);
       }
     }
+    */
     /*
     grunt.log.subhead('Copying CSS files');
     var css = [
diff --git a/UI/WebServerResources/bower.json b/UI/WebServerResources/bower.json
index f747ccbb9..980a020e1 100644
--- a/UI/WebServerResources/bower.json
+++ b/UI/WebServerResources/bower.json
@@ -11,7 +11,6 @@
     "angular-vs-repeat": "latest",
     "angular-file-upload": "latest",
     "angular-material": "master",
-    "material-design-iconic-font": "1.1.1",
     "compass-mixins": "latest",
     "underscore": "latest",
     "breakpoint-sass": ">=2.4.2"
diff --git a/UI/WebServerResources/fonts/Material-Design-Iconic-Font.eot b/UI/WebServerResources/fonts/Material-Design-Iconic-Font.eot
deleted file mode 100644
index df3fa775b..000000000
Binary files a/UI/WebServerResources/fonts/Material-Design-Iconic-Font.eot and /dev/null differ
diff --git a/UI/WebServerResources/fonts/Material-Design-Iconic-Font.ttf b/UI/WebServerResources/fonts/Material-Design-Iconic-Font.ttf
deleted file mode 100644
index b41cdc32b..000000000
Binary files a/UI/WebServerResources/fonts/Material-Design-Iconic-Font.ttf and /dev/null differ
diff --git a/UI/WebServerResources/fonts/MaterialIcons-Regular.eot b/UI/WebServerResources/fonts/MaterialIcons-Regular.eot
new file mode 100644
index 000000000..b90292263
Binary files /dev/null and b/UI/WebServerResources/fonts/MaterialIcons-Regular.eot differ
diff --git a/UI/WebServerResources/fonts/MaterialIcons-Regular.ttf b/UI/WebServerResources/fonts/MaterialIcons-Regular.ttf
new file mode 100644
index 000000000..0768c78c3
Binary files /dev/null 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
new file mode 100644
index 000000000..3a08d45e4
Binary files /dev/null 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
new file mode 100644
index 000000000..b1ffe8cfa
Binary files /dev/null and b/UI/WebServerResources/fonts/MaterialIcons-Regular.woff2 differ
diff --git a/UI/WebServerResources/fonts/Ubuntu-C.ttf b/UI/WebServerResources/fonts/Ubuntu-C.ttf
deleted file mode 100644
index 8d3e86765..000000000
Binary files a/UI/WebServerResources/fonts/Ubuntu-C.ttf and /dev/null differ