diff --git a/NzbDrone.Web/Content/Images/Newzbin.png b/NzbDrone.Web/Content/Images/Indexers/Newzbin.png
similarity index 100%
rename from NzbDrone.Web/Content/Images/Newzbin.png
rename to NzbDrone.Web/Content/Images/Indexers/Newzbin.png
diff --git a/NzbDrone.Web/Content/Images/NzbMatrix.png b/NzbDrone.Web/Content/Images/Indexers/NzbMatrix.png
similarity index 100%
rename from NzbDrone.Web/Content/Images/NzbMatrix.png
rename to NzbDrone.Web/Content/Images/Indexers/NzbMatrix.png
diff --git a/NzbDrone.Web/Content/Images/NzbsOrg.png b/NzbDrone.Web/Content/Images/Indexers/NzbsOrg.png
similarity index 100%
rename from NzbDrone.Web/Content/Images/NzbsOrg.png
rename to NzbDrone.Web/Content/Images/Indexers/NzbsOrg.png
diff --git a/NzbDrone.Web/Content/Images/NzbsRus.png b/NzbDrone.Web/Content/Images/Indexers/NzbsRus.png
similarity index 100%
rename from NzbDrone.Web/Content/Images/NzbsRus.png
rename to NzbDrone.Web/Content/Images/Indexers/NzbsRus.png
diff --git a/NzbDrone.Web/Content/Images/Unknown.png b/NzbDrone.Web/Content/Images/Indexers/Unknown.png
similarity index 100%
rename from NzbDrone.Web/Content/Images/Unknown.png
rename to NzbDrone.Web/Content/Images/Indexers/Unknown.png
diff --git a/NzbDrone.Web/Controllers/HistoryController.cs b/NzbDrone.Web/Controllers/HistoryController.cs
index 0148e3837..e74e8a75d 100644
--- a/NzbDrone.Web/Controllers/HistoryController.cs
+++ b/NzbDrone.Web/Controllers/HistoryController.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+using System;
+using System.Linq;
 using System.Web.Mvc;
 using NzbDrone.Core.Model;
 using NzbDrone.Core.Providers;
@@ -55,7 +56,7 @@ namespace NzbDrone.Web.Controllers
                                                                           Quality = h.Quality.ToString(),
                                                                           IsProper = h.IsProper,
                                                                           Date = h.Date,
-                                                                          Indexer = h.Indexer.ToString()
+                                                                          Indexer = String.IsNullOrEmpty(h.Indexer.ToString()) ? "Unknown" : h.Indexer.ToString()
                                                                       });
 
             return View(new GridModel(history));
diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index 3cb296bbf..18e901683 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -559,10 +559,17 @@
     <Content Include="Content\ajax-loader.gif" />
     <Content Include="Content\ie.css" />
     <Content Include="Content\Images\arrow.png" />
+    <Content Include="Content\Images\favicon.ico" />
+    <Content Include="Content\Images\icon.jpg" />
     <Content Include="Content\Images\img01.jpg" />
     <Content Include="Content\Images\img02.jpg" />
     <Content Include="Content\Images\img03.jpg" />
     <Content Include="Content\Images\img07.jpg" />
+    <Content Include="Content\Images\Indexers\Newzbin.png" />
+    <Content Include="Content\Images\Indexers\NzbMatrix.png" />
+    <Content Include="Content\Images\Indexers\NzbsOrg.png" />
+    <Content Include="Content\Images\Indexers\NzbsRus.png" />
+    <Content Include="Content\Images\Indexers\Unknown.png" />
     <Content Include="Content\Images\Plus.png" />
     <Content Include="Content\Images\spin.gif" />
     <Content Include="Content\Images\ui-bg_diagonals-small_0_aaaaaa_40x40.png" />
diff --git a/NzbDrone.Web/Views/History/Index.cshtml b/NzbDrone.Web/Views/History/Index.cshtml
index 91a4a17b8..2e588ddea 100644
--- a/NzbDrone.Web/Views/History/Index.cshtml
+++ b/NzbDrone.Web/Views/History/Index.cshtml
@@ -16,7 +16,7 @@ History
             .Columns(columns =>
                          {
                              columns.Bound(c => c.Indexer)
-                                    .ClientTemplate("<center><img alt='<#= Indexer #>' src='" + Url.Content("~/Content/Images/") + "<#= Indexer #>.png' /></center>")
+                                    .ClientTemplate("<center><img alt='<#= Indexer #>' src='" + Url.Content("~/Content/Images/Indexers/") + "<#= Indexer #>.png' /></center>")
                                     .Title("")
                                     .Width(20);
                              columns.Bound(c => c.SeriesTitle).Title("Series Name");
diff --git a/NzbDrone.Web/Views/Settings/Indexers.cshtml b/NzbDrone.Web/Views/Settings/Indexers.cshtml
index 7cb1e38e9..29987e691 100644
--- a/NzbDrone.Web/Views/Settings/Indexers.cshtml
+++ b/NzbDrone.Web/Views/Settings/Indexers.cshtml
@@ -67,7 +67,7 @@
                     {
                         item.Add()
                             .Text("NZBs.org")
-                            .ImageUrl("~/Content/Images/NzbsOrg.png")
+                            .ImageUrl("~/Content/Images/Indexers/NzbsOrg.png")
                             .Content(
                                 "<div class=\"section_content\">" +
 
@@ -100,7 +100,7 @@
                             );
                         item.Add()
                             .Text("NZB Matrix")
-                            .ImageUrl("~/Content/Images/NzbMatrix.png")
+                            .ImageUrl("~/Content/Images/Indexers/NzbMatrix.png")
                             .Content(
                                 "<div class=\"section_content\">" +
 
@@ -133,7 +133,7 @@
                             );
                         item.Add()
                             .Text("NZBsRus")
-                            .ImageUrl("~/Content/Images/NzbsRus.png")
+                            .ImageUrl("~/Content/Images/Indexers/NzbsRus.png")
                             .Content(
                                 "<div class=\"section_content\">" +
 
@@ -166,7 +166,7 @@
                             );
                         item.Add()
                             .Text("Newzbin")
-                            .ImageUrl("~/Content/Images/Newzbin.png")
+                            .ImageUrl("~/Content/Images/Indexers/Newzbin.png")
                             .Content(
                                 "<div class=\"section_content\">" +