diff --git a/NzbDrone.Web/Controllers/ImageController.cs b/NzbDrone.Web/Controllers/ImageController.cs
new file mode 100644
index 000000000..e46185d9d
--- /dev/null
+++ b/NzbDrone.Web/Controllers/ImageController.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+using NzbDrone.Common;
+
+namespace NzbDrone.Web.Controllers
+{
+    public class ImageController : Controller
+    {
+        private readonly DiskProvider _diskProvider;
+
+        public ImageController(DiskProvider diskProvider)
+        {
+            _diskProvider = diskProvider;
+        }
+
+        public ActionResult Newznab(string name)
+        {
+            var dir = Server.MapPath("/Content/Images/Indexers");
+            var path = Path.Combine(dir, String.Format("{0}.png", name));
+
+            if (_diskProvider.FileExists(path))
+                return File(path, "image/png");
+
+            return File(Path.Combine(dir, "Newznab.png"), "image/png");
+        }
+    }
+}
diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index ffe71f1aa..e567f8d2e 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -197,6 +197,7 @@
   <ItemGroup>
     <Compile Include="App_Start\DataTablesMvc.cs" />
     <Compile Include="App_Start\MiniProfiler.cs" />
+    <Compile Include="Controllers\ImageController.cs" />
     <Compile Include="Controllers\SearchHistoryController.cs" />
     <Compile Include="Helpers\Binders\QualityTypesBinder.cs" />
     <Compile Include="Helpers\RenderActionHelper.cs" />
diff --git a/NzbDrone.Web/Views/History/Index.cshtml b/NzbDrone.Web/Views/History/Index.cshtml
index 0031ba806..6441359dd 100644
--- a/NzbDrone.Web/Views/History/Index.cshtml
+++ b/NzbDrone.Web/Views/History/Index.cshtml
@@ -63,7 +63,7 @@
                                         // 'display' and 'filter' use the image
                                         if (type === 'display' || type === 'filter') {
                                             if (source['Indexer'].indexOf("Newznab") === 0)
-                                                return "<img src='/Content/Images/Indexers/" + source['Indexer'] + ".png' alt='" + source["Indexer"].replace('_', ' - ') + "' title='" + source["Indexer"].replace('_', ' - ') + "' onerror='this.src=\"/Content/Images/Indexers/Newznab.png\"'>";
+                                                return '<img src="/Image/Newznab?name=' + source['Indexer'] + '" alt="' + source['Indexer'].replace('_', ' - ') + '" title="' + source['Indexer'].replace('_', ' - ') + '">';
 
                                             return "<img src='/Content/Images/Indexers/" + source['Indexer'] + ".png' alt='" + source["Indexer"] + "' title='" + source["Indexer"] + "'>";
                                         }
diff --git a/NzbDrone.Web/Views/SearchHistory/Details.cshtml b/NzbDrone.Web/Views/SearchHistory/Details.cshtml
index 2aa409d0f..3a94b69e5 100644
--- a/NzbDrone.Web/Views/SearchHistory/Details.cshtml
+++ b/NzbDrone.Web/Views/SearchHistory/Details.cshtml
@@ -15,7 +15,7 @@
     @(Html.GridScriptFor(m => m.SearchHistoryItems, "#searchDetailsGrid")
                 .PageLength(20)
                 .ChangePageLength(false)
-                .AddColumn(new Column().Image("/Content/Images/Indexers/{Indexer}.png", new { alt = "{Indexer}", title = "{Indexer}" }, "{Indexer}").Sortable(false).Title("").Width("20px"))
+                .AddColumn(new Column().Image("/Image/Newznab?name={Indexer}", new { alt = "{Indexer}", title = "{Indexer}" }, "{Indexer}").Sortable(false).Title("").Width("20px"))
                 .AddColumn(new Column().DataProperty("ReportTitle").Title("Report Title"))
                 .AddColumn(new Column().DataProperty("Success").Title("Successful").Width("100px"))
                 //.AddColumn(new Column().Image("/Content/Images/{Success}.png", new { alt = "{Success}", title = "{Success}", @class = "gridImage" }, "{Success}").Title("Successful").Width("100px"))