diff --git a/src/Icons/Controllers/IconsController.cs b/src/Icons/Controllers/IconsController.cs
index df44f915fa..34c1da2133 100644
--- a/src/Icons/Controllers/IconsController.cs
+++ b/src/Icons/Controllers/IconsController.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Net;
 using System.Net.Http;
@@ -18,6 +19,15 @@ namespace Bit.Icons.Controllers
             AllowAutoRedirect = false,
             AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate
         });
+        static readonly List<byte[]> _validImageData = new List<byte[]>
+        {
+            // png
+            new byte[] { 137, 80, 78, 71 },
+            // ico
+            new byte[] { 00, 00, 01, 00 },
+            // jpeg
+            new byte[] { 255, 216, 255 }
+        };
         private readonly IMemoryCache _memoryCache;
         private readonly IDomainMappingService _domainMappingService;
         private readonly IconsSettings _iconsSettings;
@@ -60,6 +70,11 @@ namespace Bit.Icons.Controllers
                 }
 
                 var image = await response.Content.ReadAsByteArrayAsync();
+                if(!_validImageData.Any(d => d.SequenceEqual(image.Take(d.Length))))
+                {
+                    return new NotFoundResult();
+                }
+
                 icon = new Icon
                 {
                     Image = image,
diff --git a/src/Icons/appsettings.json b/src/Icons/appsettings.json
index e4535f3a0c..7c2dc44628 100644
--- a/src/Icons/appsettings.json
+++ b/src/Icons/appsettings.json
@@ -13,7 +13,7 @@
     }
   },
   "iconsSettings": {
-    "bestIconBaseUrl": "https://icons.better-idea.org",
+    "bestIconBaseUrl": "https://besticon-demo.herokuapp.com",
     "cacheHours": 24,
     "cacheSizeLimit": null
   }