diff --git a/Gruntfile.js b/Gruntfile.js
index 6128efd38..e91992882 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -114,6 +114,10 @@ module.exports = function (grunt) {
                 src : 'UI/**/*.jpg',
                 dest: '_output/'
             },
+            icon : {
+                src : 'UI/**/*.ico',
+                dest: '_output/'
+            },
             fontAwesome  : {
                 src : 'UI/**/FontAwesome/*.*',
                 dest: '_output/'
@@ -160,6 +164,10 @@ module.exports = function (grunt) {
                 files: '<%= copy.jpg.src %>',
                 tasks: ['copy:jpg']
             },
+            copyJpg : {
+                files: '<%= copy.icon.src %>',
+                tasks: ['copy:icon']
+            },
             copyFontAwesome  : {
                 files: '<%= copy.fontAwesome.src %>',
                 tasks: ['copy:fontAwesome']
diff --git a/NzbDrone.Api/NancyBootstrapper.cs b/NzbDrone.Api/NancyBootstrapper.cs
index 400817880..186dac41f 100644
--- a/NzbDrone.Api/NancyBootstrapper.cs
+++ b/NzbDrone.Api/NancyBootstrapper.cs
@@ -74,6 +74,14 @@ namespace NzbDrone.Api
             Conventions.StaticContentsConventions.Add(processors.ProcessStaticResourceRequest);
         }
 
+        protected override byte[] FavIcon
+        {
+            get
+            {
+                return null;
+            }
+        }
+
         public void Shutdown()
         {
             ApplicationContainer.Resolve<IMessageAggregator>().PublishEvent(new ApplicationShutdownRequested());
diff --git a/NzbDrone.Console/NzbDrone.Console.csproj b/NzbDrone.Console/NzbDrone.Console.csproj
index f341be0ea..5e6425b74 100644
--- a/NzbDrone.Console/NzbDrone.Console.csproj
+++ b/NzbDrone.Console/NzbDrone.Console.csproj
@@ -56,8 +56,7 @@
     <IntermediateOutputPath>C:\Users\Mark\AppData\Local\Temp\vs1A55.tmp\x86\Release\</IntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon>..\NzbDrone\NzbDrone.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>NzbDrone.Console.AppMain</StartupObject>
diff --git a/NzbDrone.Core/NzbDrone.Core.csproj b/NzbDrone.Core/NzbDrone.Core.csproj
index 3e3c5299b..d5d74da0e 100644
--- a/NzbDrone.Core/NzbDrone.Core.csproj
+++ b/NzbDrone.Core/NzbDrone.Core.csproj
@@ -172,7 +172,6 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Web" />
-    <Reference Include="System.Web.Extensions" />
     <Reference Include="System.XML" />
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
diff --git a/NzbDrone.Core/NzbDrone.ico b/NzbDrone.Core/NzbDrone.ico
deleted file mode 100644
index 1d6e4d3f4..000000000
Binary files a/NzbDrone.Core/NzbDrone.ico and /dev/null differ
diff --git a/NzbDrone/NzbDrone.ico b/NzbDrone/NzbDrone.ico
index 1d6e4d3f4..94a68b293 100644
Binary files a/NzbDrone/NzbDrone.ico and b/NzbDrone/NzbDrone.ico differ
diff --git a/UI/Content/Images/logo.png b/UI/Content/Images/logo.png
new file mode 100644
index 000000000..7916facc4
Binary files /dev/null and b/UI/Content/Images/logo.png differ
diff --git a/UI/Content/menu.less b/UI/Content/menu.less
index 549301b0b..78f1000cb 100644
--- a/UI/Content/menu.less
+++ b/UI/Content/menu.less
@@ -15,11 +15,22 @@
 }
 
 #in-sub-nav li a:focus {
-  text-decoration: none;
+  text-decoration : none;
 }
 
 #in-sub-nav {
   margin-bottom : 80px;
+
+  .span12 {
+    margin-left : 0px;
+  }
+
+  .logo {
+    margin-top     : 25px;
+    vertical-align : middle;
+    height         : 70px;
+    width          : 70px;
+  }
 }
 
 .backdrop #in-sub-nav {
diff --git a/UI/Index.html b/UI/Index.html
index db024671d..908fe45ec 100644
--- a/UI/Index.html
+++ b/UI/Index.html
@@ -21,6 +21,9 @@
     <div class="container">
         <div class="row">
             <div class="span12">
+                <div class="pull-left logo">
+                    <img src="/Content/Images/logo.png" alt="">
+                </div>
                 <ul id="main-menu-region">
                     <li>
                         <a href="/">
diff --git a/UI/favicon.ico b/UI/favicon.ico
index ddfdd7a83..5ed464a9b 100644
Binary files a/UI/favicon.ico and b/UI/favicon.ico differ