diff --git a/Chocolatey Explorer/Chocolatey.Explorer.csproj b/Chocolatey Explorer/Chocolatey.Explorer.csproj
index b98683877..88bf4a737 100644
--- a/Chocolatey Explorer/Chocolatey.Explorer.csproj	
+++ b/Chocolatey Explorer/Chocolatey.Explorer.csproj	
@@ -82,8 +82,7 @@
     <CodeAnalysisIgnoreBuiltInRules>true</CodeAnalysisIgnoreBuiltInRules>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>
-    </ApplicationIcon>
+    <ApplicationIcon>chocolateyicon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="NLog">
@@ -322,6 +321,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="chocolateyicon.ico" />
     <Content Include="Resources\chocolateyicon.gif" />
     <Content Include="Resources\folder_small.png" />
     <None Include="Resources\packageicon_default.png" />
diff --git a/Chocolatey Explorer/IoC/Registry.cs b/Chocolatey Explorer/IoC/Registry.cs
index 85c376f04..73d128e11 100644
--- a/Chocolatey Explorer/IoC/Registry.cs	
+++ b/Chocolatey Explorer/IoC/Registry.cs	
@@ -22,6 +22,7 @@ public Registry()
              // Services
              For<IPackageService>().Singleton().Use<PackageService>();
              For<IAvailablePackagesService>().Singleton().Use<CachedAvailablePackagesService>();
+             For<IODataAvailablePackagesService>().Singleton().Use<ODataAvailablePackagesService>();
              For<IInstalledPackagesService>().Singleton().Use<CachedInstalledPackagesService>();
              For<IPackageVersionService>().Singleton().Use<CachedPackageVersionService>();
              For<IChocolateyService>().Use<ChocolateyService>();
diff --git a/Chocolatey Explorer/Services/PackagesService/CachedAvailablePackagesService.cs b/Chocolatey Explorer/Services/PackagesService/CachedAvailablePackagesService.cs
index 0c1b58fb8..cb7ba95ad 100644
--- a/Chocolatey Explorer/Services/PackagesService/CachedAvailablePackagesService.cs	
+++ b/Chocolatey Explorer/Services/PackagesService/CachedAvailablePackagesService.cs	
@@ -15,12 +15,12 @@ class CachedAvailablePackagesService : IAvailablePackagesService, ICacheable
 		public event Delegates.FailedDelegate RunFailed;
         public event Delegates.StartedDelegate RunStarted;
 
-        private readonly IAvailablePackagesService _availablePackagesService;
+        private readonly IODataAvailablePackagesService _availablePackagesService;
         private IList<Package> _availablePackageCache;
         private DateTime _invalidateCacheTime;
         private readonly ISourceService _sourceService;
 
-        public CachedAvailablePackagesService(ODataAvailablePackagesService availablePackagesService, ISourceService sourceService)
+        public CachedAvailablePackagesService(IODataAvailablePackagesService availablePackagesService, ISourceService sourceService)
         {
             _availablePackagesService = availablePackagesService;
             _sourceService = sourceService;
diff --git a/Chocolatey Explorer/chocolateyicon.ico b/Chocolatey Explorer/chocolateyicon.ico
new file mode 100644
index 000000000..fa9ecd3e3
Binary files /dev/null and b/Chocolatey Explorer/chocolateyicon.ico differ
diff --git a/Chocolatey.Explorer.Test/Services/TestCachedAvailablePackagesService.cs b/Chocolatey.Explorer.Test/Services/TestCachedAvailablePackagesService.cs
index e83c4cbab..8deb989d5 100644
--- a/Chocolatey.Explorer.Test/Services/TestCachedAvailablePackagesService.cs
+++ b/Chocolatey.Explorer.Test/Services/TestCachedAvailablePackagesService.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Chocolatey.Explorer.Model;
 using Chocolatey.Explorer.Powershell;
 using Chocolatey.Explorer.Services.PackagesService;
@@ -22,39 +23,42 @@ public void Setup()
         }
 
         [Test]
-        public void IfListOfPackagesCallsPowershellRun()
+        public void IfListOfPackagesCallsPackagesServiceListOfPackagesWhenNoCache()
         {
-            var packagesService = _mocks.Get<ODataAvailablePackagesService>();
-            var sourceService = _mocks.Get<ISourceService>();
-            sourceService.Expect(x => x.Source)
-                .Return(new Source { Url = "test" });
+            var packagesService = _mocks.Get<IODataAvailablePackagesService>();
             _service.ListOfAvailablePackages();
             packagesService.AssertWasCalled(mock => mock.ListOfAvailablePackages());
         }
 
         [Test]
-        public void IfRaisesRunFinishedOnRunWithoutLines()
+        public void IfRaisesRunFinishedOnPackagesServiceRunFinishedWhenNoCache()
         {
-            var powershell = _mocks.Get<IRunAsync>();
+            var packagesService = _mocks.Get<IODataAvailablePackagesService>();
             var result = 0;
             _service.RunFinshed += (x) => result = 1;
-            powershell.GetEventRaiser(x => x.RunFinished += null).Raise();
+            packagesService.GetEventRaiser(x => x.RunFinshed += null).Raise(new List<Package>());
 
             Assert.AreEqual(1, result);
         }
 
         [Test]
-        public void IfRaisesRunFinishedOnRunWithLines()
+        public void IfRaisesRunFailedOnPackagesServiceRunFailedWhenNoCache()
         {
-            var powershell = _mocks.Get<IRunAsync>();
-            IList<Package> result = new List<Package>();
-            _service.RunFinshed += (x) => result = x;
-            powershell.GetEventRaiser(x => x.OutputChanged += null).Raise("test testversion");
-            powershell.GetEventRaiser(x => x.RunFinished += null).Raise();
-
-            Assert.AreEqual(1, result.Count);
-            Assert.AreEqual("test", result[0].Name);
-            Assert.AreEqual("testversion", result[0].InstalledVersion);
+            var packagesService = _mocks.Get<IODataAvailablePackagesService>();
+            var result = 0;
+            _service.RunFailed += (x) => result = 1;
+            packagesService.GetEventRaiser(x => x.RunFailed += null).Raise(new Exception());
+
+            Assert.AreEqual(1, result);
+        }
+
+        [Test]
+        public void IfRaisesRunRunStartedOnListOfAvailablePackages()
+        {
+            var result = 0;
+            _service.RunStarted += (x) => result = 1;
+            _service.ListOfAvailablePackages();
+            Assert.AreEqual(1, result);
         } 
     }
 }
\ No newline at end of file