diff --git a/src/NzbDrone.Console/NzbDrone.Console.csproj b/src/NzbDrone.Console/NzbDrone.Console.csproj
index a1a04c94f..6c35d7672 100644
--- a/src/NzbDrone.Console/NzbDrone.Console.csproj
+++ b/src/NzbDrone.Console/NzbDrone.Console.csproj
@@ -54,7 +54,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>..\NzbDrone.Host\NzbDrone.ico</ApplicationIcon>
+    <ApplicationIcon>Radarr.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>NzbDrone.Console.ConsoleApp</StartupObject>
@@ -139,6 +139,9 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Radarr.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
diff --git a/src/NzbDrone.Console/Radarr.ico b/src/NzbDrone.Console/Radarr.ico
new file mode 100644
index 000000000..6f0a8b50e
Binary files /dev/null and b/src/NzbDrone.Console/Radarr.ico differ
diff --git a/src/NzbDrone.Host/NzbDrone.Host.csproj b/src/NzbDrone.Host/NzbDrone.Host.csproj
index 187c8284e..d42d1f820 100644
--- a/src/NzbDrone.Host/NzbDrone.Host.csproj
+++ b/src/NzbDrone.Host/NzbDrone.Host.csproj
@@ -56,6 +56,9 @@
   <PropertyGroup>
     <RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>Radarr.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Owin, Version=2.1.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -134,9 +137,6 @@
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="NzbDrone.ico" />
-  </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0">
       <Visible>False</Visible>
@@ -185,7 +185,9 @@
       <Name>NzbDrone.SignalR</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="Radarr.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
diff --git a/src/NzbDrone.Host/NzbDrone.ico b/src/NzbDrone.Host/NzbDrone.ico
deleted file mode 100644
index 1922557d6..000000000
Binary files a/src/NzbDrone.Host/NzbDrone.ico and /dev/null differ
diff --git a/src/NzbDrone.Host/Radarr.ico b/src/NzbDrone.Host/Radarr.ico
new file mode 100644
index 000000000..6f0a8b50e
Binary files /dev/null and b/src/NzbDrone.Host/Radarr.ico differ
diff --git a/src/NzbDrone/NzbDrone.csproj b/src/NzbDrone/NzbDrone.csproj
index b54e9ea34..0ae327fd2 100644
--- a/src/NzbDrone/NzbDrone.csproj
+++ b/src/NzbDrone/NzbDrone.csproj
@@ -54,7 +54,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>..\NzbDrone.Host\NzbDrone.ico</ApplicationIcon>
+    <ApplicationIcon>Radarr.ico</ApplicationIcon>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>NzbDrone.WindowsApp</StartupObject>
@@ -147,6 +147,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
@@ -155,6 +156,9 @@
     </None>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Radarr.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PreBuildEvent>
diff --git a/src/NzbDrone/Properties/Resources.Designer.cs b/src/NzbDrone/Properties/Resources.Designer.cs
index 65584111d..f01f723db 100644
--- a/src/NzbDrone/Properties/Resources.Designer.cs
+++ b/src/NzbDrone/Properties/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.32559
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -9,6 +9,9 @@
 //------------------------------------------------------------------------------
 
 namespace NzbDrone.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -60,9 +63,9 @@ namespace NzbDrone.Properties {
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
         /// </summary>
-        internal static System.Drawing.Icon NzbDroneIcon {
+        internal static System.Drawing.Icon Radarr {
             get {
-                object obj = ResourceManager.GetObject("NzbDroneIcon", resourceCulture);
+                object obj = ResourceManager.GetObject("Radarr", resourceCulture);
                 return ((System.Drawing.Icon)(obj));
             }
         }
diff --git a/src/NzbDrone/Properties/Resources.resx b/src/NzbDrone/Properties/Resources.resx
index 408bab357..ca21e650d 100644
--- a/src/NzbDrone/Properties/Resources.resx
+++ b/src/NzbDrone/Properties/Resources.resx
@@ -118,7 +118,7 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="NzbDroneIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\..\NzbDrone.Host\NzbDrone.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Radarr" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Radarr.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/src/NzbDrone/Radarr.ico b/src/NzbDrone/Radarr.ico
new file mode 100644
index 000000000..6f0a8b50e
Binary files /dev/null and b/src/NzbDrone/Radarr.ico differ
diff --git a/src/NzbDrone/SysTray/SysTrayApp.cs b/src/NzbDrone/SysTray/SysTrayApp.cs
index 5cf523101..c4415d496 100644
--- a/src/NzbDrone/SysTray/SysTrayApp.cs
+++ b/src/NzbDrone/SysTray/SysTrayApp.cs
@@ -39,7 +39,7 @@ namespace NzbDrone.SysTray
             _trayMenu.MenuItems.Add("Exit", OnExit);
 
             _trayIcon.Text = string.Format("Radarr - {0}", BuildInfo.Version);
-            _trayIcon.Icon = Properties.Resources.NzbDroneIcon;
+            _trayIcon.Icon = Properties.Resources.Radarr;
 
             _trayIcon.ContextMenu = _trayMenu;
             _trayIcon.Visible = true;
diff --git a/src/Radarr.ico b/src/Radarr.ico
new file mode 100644
index 000000000..6f0a8b50e
Binary files /dev/null and b/src/Radarr.ico differ