diff --git a/Gruntfile.js b/Gruntfile.js
index 8fe0c7a3c..36418330a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -114,9 +114,13 @@ module.exports = function (grunt) {
                 src : 'UI/**/*.jpg',
                 dest: '_output/'
             },
-            fonts  : {
+            fontAwesome  : {
                 src : 'UI/**/FontAwesome/*.*',
                 dest: '_output/'
+            },
+            fonts  : {
+                src : 'UI/**/fonts/*.*',
+                dest: '_output/'
             }
         },
 
@@ -153,6 +157,10 @@ module.exports = function (grunt) {
                 files: '<%= copy.jpg.src %>',
                 tasks: ['copy:jpg']
             },
+            copyFontAwesome  : {
+                files: '<%= copy.fontAwesome.src %>',
+                tasks: ['copy:fontAwesome']
+            },
             copyFonts  : {
                 files: '<%= copy.fonts.src %>',
                 tasks: ['copy:fonts']
diff --git a/NzbDrone.Api/Frontend/StaticResourceMapper.cs b/NzbDrone.Api/Frontend/StaticResourceMapper.cs
index 885be79d1..f04421efe 100644
--- a/NzbDrone.Api/Frontend/StaticResourceMapper.cs
+++ b/NzbDrone.Api/Frontend/StaticResourceMapper.cs
@@ -8,7 +8,21 @@ namespace NzbDrone.Api.Frontend
     public class StaticResourceMapper : IMapHttpRequestsToDisk
     {
         private readonly IEnvironmentProvider _environmentProvider;
-        private static readonly string[] Extensions = new[] { ".css", ".js", ".html", ".htm", ".jpg", ".jpeg", ".icon", ".gif", ".png", ".woff", ".ttf" };
+        private static readonly string[] Extensions = new[] { 
+                                                              ".css",
+                                                              ".js",
+                                                              ".html",
+                                                              ".htm",
+                                                              ".jpg",
+                                                              ".jpeg",
+                                                              ".ico",
+                                                              ".icon",
+                                                              ".gif",
+                                                              ".png",
+                                                              ".woff",
+                                                              ".ttf",
+                                                              ".eot"
+                                                            };
 
         public StaticResourceMapper(IEnvironmentProvider environmentProvider)
         {
diff --git a/UI/Content/font.css b/UI/Content/font.css
deleted file mode 100644
index de0bbe02b..000000000
--- a/UI/Content/font.css
+++ /dev/null
@@ -1,42 +0,0 @@
-@font-face {
-    font-family: 'Open Sans';
-    font-style: normal;
-    font-weight: 300;
-    src: url(http://themes.googleusercontent.com/static/fonts/opensans/v6/DXI1ORHCpsQm3Vp6mXoaTXZ2MAKAc2x4R1uOSeegc5U.eot);
-    src: local('Open Sans Light'), local('OpenSans-Light'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/DXI1ORHCpsQm3Vp6mXoaTXZ2MAKAc2x4R1uOSeegc5U.eot) format('embedded-opentype'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/DXI1ORHCpsQm3Vp6mXoaTXhCUOGz7vYGh680lGh-uXM.woff) format('woff');
-}
-@font-face {
-    font-family: 'Open Sans';
-    font-style: normal;
-    font-weight: 400;
-    src: url(http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3fY6323mHUZFJMgTvxaG2iE.eot);
-    src: local('Open Sans'), local('OpenSans'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3fY6323mHUZFJMgTvxaG2iE.eot) format('embedded-opentype'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/cJZKeOuBrn4kERxqtaUH3T8E0i7KZn-EPnyo3HZu7kw.woff) format('woff');
-}
-@font-face {
-    font-family: 'Open Sans';
-    font-style: normal;
-    font-weight: 600;
-    src: url(http://themes.googleusercontent.com/static/fonts/opensans/v6/MTP_ySUJH_bn48VBG8sNSnZ2MAKAc2x4R1uOSeegc5U.eot);
-    src: local('Open Sans Semibold'), local('OpenSans-Semibold'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/MTP_ySUJH_bn48VBG8sNSnZ2MAKAc2x4R1uOSeegc5U.eot) format('embedded-opentype'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/MTP_ySUJH_bn48VBG8sNSnhCUOGz7vYGh680lGh-uXM.woff) format('woff');
-}
-@font-face {
-    font-family: 'Open Sans';
-    font-style: italic;
-    font-weight: 300;
-    src: url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxrXcjzEax2LfQAlK8DdMzhA.eot);
-    src: local('Open Sans Light Italic'), local('OpenSansLight-Italic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxrXcjzEax2LfQAlK8DdMzhA.eot) format('embedded-opentype'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxh_xHqYgAV9Bl_ZQbYUxnQU.woff) format('woff');
-}
-@font-face {
-    font-family: 'Open Sans';
-    font-style: italic;
-    font-weight: 400;
-    src: url(http://themes.googleusercontent.com/static/fonts/opensans/v6/xjAJXh38I15wypJXxuGMBmfQcKutQXcIrRfyR5jdjY8.eot);
-    src: local('Open Sans Italic'), local('OpenSans-Italic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/xjAJXh38I15wypJXxuGMBmfQcKutQXcIrRfyR5jdjY8.eot) format('embedded-opentype'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/xjAJXh38I15wypJXxuGMBobN6UDyHWBl620a-IRfuBk.woff) format('woff');
-}
-@font-face {
-    font-family: 'Open Sans';
-    font-style: italic;
-    font-weight: 600;
-    src: url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxo8mkAiYpFywqG2RvpzBnTU.eot);
-    src: local('Open Sans Semibold Italic'), local('OpenSans-SemiboldItalic'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxo8mkAiYpFywqG2RvpzBnTU.eot) format('embedded-opentype'), url(http://themes.googleusercontent.com/static/fonts/opensans/v6/PRmiXeptR36kaC0GEAetxn5HxGBcBvicCpTp6spHfNo.woff) format('woff');
-}
diff --git a/UI/Content/fonts/OpenSans-Italic.eot b/UI/Content/fonts/OpenSans-Italic.eot
new file mode 100644
index 000000000..3fa532787
Binary files /dev/null and b/UI/Content/fonts/OpenSans-Italic.eot differ
diff --git a/UI/Content/fonts/OpenSans-Italic.ttf b/UI/Content/fonts/OpenSans-Italic.ttf
new file mode 100644
index 000000000..c90da48ff
Binary files /dev/null and b/UI/Content/fonts/OpenSans-Italic.ttf differ
diff --git a/UI/Content/fonts/OpenSans-Italic.woff b/UI/Content/fonts/OpenSans-Italic.woff
new file mode 100644
index 000000000..cedefb8f6
Binary files /dev/null and b/UI/Content/fonts/OpenSans-Italic.woff differ
diff --git a/UI/Content/fonts/OpenSans-Light.eot b/UI/Content/fonts/OpenSans-Light.eot
new file mode 100644
index 000000000..3c203d8e7
Binary files /dev/null and b/UI/Content/fonts/OpenSans-Light.eot differ
diff --git a/UI/Content/fonts/OpenSans-Light.ttf b/UI/Content/fonts/OpenSans-Light.ttf
new file mode 100644
index 000000000..0d381897d
Binary files /dev/null and b/UI/Content/fonts/OpenSans-Light.ttf differ
diff --git a/UI/Content/fonts/OpenSans-Light.woff b/UI/Content/fonts/OpenSans-Light.woff
new file mode 100644
index 000000000..99f335326
Binary files /dev/null and b/UI/Content/fonts/OpenSans-Light.woff differ
diff --git a/UI/Content/fonts/OpenSans-LightItalic.eot b/UI/Content/fonts/OpenSans-LightItalic.eot
new file mode 100644
index 000000000..6005799a2
Binary files /dev/null and b/UI/Content/fonts/OpenSans-LightItalic.eot differ
diff --git a/UI/Content/fonts/OpenSans-LightItalic.ttf b/UI/Content/fonts/OpenSans-LightItalic.ttf
new file mode 100644
index 000000000..68299c4bc
Binary files /dev/null and b/UI/Content/fonts/OpenSans-LightItalic.ttf differ
diff --git a/UI/Content/fonts/OpenSans-LightItalic.woff b/UI/Content/fonts/OpenSans-LightItalic.woff
new file mode 100644
index 000000000..dd0a0ea26
Binary files /dev/null and b/UI/Content/fonts/OpenSans-LightItalic.woff differ
diff --git a/UI/Content/fonts/OpenSans-Regular.eot b/UI/Content/fonts/OpenSans-Regular.eot
new file mode 100644
index 000000000..091cd51b9
Binary files /dev/null and b/UI/Content/fonts/OpenSans-Regular.eot differ
diff --git a/UI/Content/fonts/OpenSans-Regular.ttf b/UI/Content/fonts/OpenSans-Regular.ttf
new file mode 100644
index 000000000..db433349b
Binary files /dev/null and b/UI/Content/fonts/OpenSans-Regular.ttf differ
diff --git a/UI/Content/fonts/OpenSans-Regular.woff b/UI/Content/fonts/OpenSans-Regular.woff
new file mode 100644
index 000000000..55b25f867
Binary files /dev/null and b/UI/Content/fonts/OpenSans-Regular.woff differ
diff --git a/UI/Content/fonts/OpenSans-SemiBold.eot b/UI/Content/fonts/OpenSans-SemiBold.eot
new file mode 100644
index 000000000..55d28c378
Binary files /dev/null and b/UI/Content/fonts/OpenSans-SemiBold.eot differ
diff --git a/UI/Content/fonts/OpenSans-SemiBold.woff b/UI/Content/fonts/OpenSans-SemiBold.woff
new file mode 100644
index 000000000..e83bb333d
Binary files /dev/null and b/UI/Content/fonts/OpenSans-SemiBold.woff differ
diff --git a/UI/Content/fonts/OpenSans-Semibold.ttf b/UI/Content/fonts/OpenSans-Semibold.ttf
new file mode 100644
index 000000000..1a7679e39
Binary files /dev/null and b/UI/Content/fonts/OpenSans-Semibold.ttf differ
diff --git a/UI/Content/fonts/OpenSans-SemiboldItalic.eot b/UI/Content/fonts/OpenSans-SemiboldItalic.eot
new file mode 100644
index 000000000..31cd82048
Binary files /dev/null and b/UI/Content/fonts/OpenSans-SemiboldItalic.eot differ
diff --git a/UI/Content/fonts/OpenSans-SemiboldItalic.ttf b/UI/Content/fonts/OpenSans-SemiboldItalic.ttf
new file mode 100644
index 000000000..59b6d16b0
Binary files /dev/null and b/UI/Content/fonts/OpenSans-SemiboldItalic.ttf differ
diff --git a/UI/Content/fonts/OpenSans-SemiboldItalic.woff b/UI/Content/fonts/OpenSans-SemiboldItalic.woff
new file mode 100644
index 000000000..983bb3314
Binary files /dev/null and b/UI/Content/fonts/OpenSans-SemiboldItalic.woff differ
diff --git a/UI/Index.html b/UI/Index.html
index 7b9eddf43..82bde03fd 100644
--- a/UI/Index.html
+++ b/UI/Index.html
@@ -3,7 +3,6 @@
 <head runat="server">
     <title>NzbDrone</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
-    <!--<link href='//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,400,600,300' rel='stylesheet' type='text/css'>-->
     <link href="/content/font.css" rel='stylesheet' type='text/css'/>
     <link href="/content/bootstrap.css" rel='stylesheet' type='text/css'/>
     <link href="/content/bootstrap.slider.css" rel='stylesheet' type='text/css'/>