diff --git a/src/NzbDrone.Api/Frontend/Mappers/FaviconMapper.cs b/src/NzbDrone.Api/Frontend/Mappers/FaviconMapper.cs
index e82fcd898..2947de2e8 100644
--- a/src/NzbDrone.Api/Frontend/Mappers/FaviconMapper.cs
+++ b/src/NzbDrone.Api/Frontend/Mappers/FaviconMapper.cs
@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using NLog;
 using NzbDrone.Common.Disk;
@@ -17,7 +18,14 @@ namespace NzbDrone.Api.Frontend.Mappers
 
         public override string Map(string resourceUrl)
         {
-            var path = Path.Combine("Content", "Images", "favicon.ico");
+            var fileName = "favicon.ico";
+
+            if (BuildInfo.IsDebug)
+            {
+                fileName = "favicon-debug.ico";
+            }
+
+            var path = Path.Combine("Content", "Images", fileName);
 
             return Path.Combine(_appFolderInfo.StartUpFolder, "UI", path);
         }
diff --git a/src/UI/Content/Images/favicon-debug.ico b/src/UI/Content/Images/favicon-debug.ico
new file mode 100644
index 000000000..db19f38e4
Binary files /dev/null and b/src/UI/Content/Images/favicon-debug.ico differ