diff --git a/NzbDrone.Web/NzbDrone.Web.Publish.xml b/NzbDrone.Web/NzbDrone.Web.Publish.xml
index 6ee397e251..df8271ea65 100644
--- a/NzbDrone.Web/NzbDrone.Web.Publish.xml
+++ b/NzbDrone.Web/NzbDrone.Web.Publish.xml
@@ -849,7 +849,7 @@
     <file relUrl="Content/2011.1.315/Outlook/slider-vs-both.gif" publishTime="03/28/2011 22:03:28" />
     <file relUrl="Content/2011.1.315/Office2007/treeview-line.png" publishTime="03/28/2011 22:03:28" />
     <file relUrl="bin/System.Web.WebPages.Razor.xml" publishTime="12/20/2010 09:52:36" />
-    <file relUrl="bin/NzbDrone.Web.dll" publishTime="04/24/2011 19:23:51" />
+    <file relUrl="bin/NzbDrone.Web.dll" publishTime="04/24/2011 19:32:25" />
     <file relUrl="Content/Images/ui-bg_glass_50_99c2ff_1x400.png" publishTime="03/07/2011 20:48:08" />
     <file relUrl="Content/2011.1.315/Sunset/treeview-line.png" publishTime="03/28/2011 22:03:28" />
     <file relUrl="Content/2011.1.315/Default/imagebrowser.png" publishTime="03/28/2011 22:03:28" />
@@ -905,7 +905,7 @@
     <file relUrl="Content/jquery-ui-1.8.8.custom.css" publishTime="03/07/2011 20:48:08" />
     <file relUrl="Content/style.css" publishTime="04/20/2011 22:33:13" />
     <file relUrl="Views/Settings/General.cshtml" publishTime="04/20/2011 17:10:28" />
-    <file relUrl="bin/NzbDrone.Web.pdb" publishTime="04/24/2011 19:23:50" />
+    <file relUrl="bin/NzbDrone.Web.pdb" publishTime="04/24/2011 19:32:25" />
     <file relUrl="Content/2011.1.315/Sunset/sprite-vertical.png" publishTime="03/28/2011 22:03:28" />
     <file relUrl="Content/2011.1.315/Default/slider-hs-both.gif" publishTime="03/28/2011 22:03:28" />
     <file relUrl="Content/2011.1.315/Office2007/slider-hs-bottom.gif" publishTime="03/28/2011 22:03:28" />
@@ -931,6 +931,7 @@
     <file relUrl="Content/2011.1.315/Outlook/slider-hs-top.gif" publishTime="03/28/2011 22:03:28" />
     <file relUrl="Content/2011.1.315/Default/slider-hs-bottom.gif" publishTime="03/28/2011 22:03:28" />
     <file relUrl="Content/2011.1.315/Vista/imagebrowser.png" publishTime="03/28/2011 22:03:28" />
+    <file relUrl="favicon.ico" publishTime="03/30/2011 16:03:38" />
     <file relUrl="Content/2011.1.315/Office2007/slider-h-top.gif" publishTime="03/28/2011 22:03:28" />
     <file relUrl="Views/AddSeries/AddNew.cshtml" publishTime="04/20/2011 23:40:55" />
     <file relUrl="App_GlobalResources/GridLocalization.fr-FR.resx" publishTime="03/30/2011 16:03:37" />
diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index 07fadb75bc..85cc4278e4 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -590,6 +590,7 @@
     <Content Include="Content\notibar.css" />
     <Content Include="Content\style.css" />
     <Content Include="Content\XbmcNotification.png" />
+    <Content Include="favicon.ico" />
     <Content Include="Global.asax" />
     <Content Include="Libraries\Ninject.Web.Mvc.dll" />
     <Content Include="Libraries\Ninject.Web.Mvc.xml" />
diff --git a/NzbDrone/NzbDrone.csproj b/NzbDrone/NzbDrone.csproj
index e3b4625cf8..983bd4931b 100644
--- a/NzbDrone/NzbDrone.csproj
+++ b/NzbDrone/NzbDrone.csproj
@@ -49,6 +49,9 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>NzbDrone.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Accessibility">
       <EmbedInteropTypes>True</EmbedInteropTypes>
@@ -88,6 +91,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Microsoft.Web.Administration.dll" />
+    <Content Include="NzbDrone.ico" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0">
diff --git a/NzbDrone/NzbDrone.ico b/NzbDrone/NzbDrone.ico
new file mode 100644
index 0000000000..1d6e4d3f40
Binary files /dev/null and b/NzbDrone/NzbDrone.ico differ