diff --git a/Source/LibationWinForms/AvaloniaUI/Views/ProductsGrid/ProductsDisplay2.Buttons.xaml.cs b/Source/LibationWinForms/AvaloniaUI/Views/ProductsGrid/ProductsDisplay2.Buttons.xaml.cs
index 237e39f0..ee5fd11d 100644
--- a/Source/LibationWinForms/AvaloniaUI/Views/ProductsGrid/ProductsDisplay2.Buttons.xaml.cs
+++ b/Source/LibationWinForms/AvaloniaUI/Views/ProductsGrid/ProductsDisplay2.Buttons.xaml.cs
@@ -32,30 +32,42 @@ namespace LibationWinForms.AvaloniaUI.Views.ProductsGrid
 			}
 		}
 
-		public async void Cover_Click(object sender, Avalonia.Interactivity.RoutedEventArgs args)
+		public void Cover_Click(object sender, Avalonia.Interactivity.RoutedEventArgs args)
 		{
 			if (sender is not Image tblock || tblock.DataContext is not GridEntry2 gEntry)
 				return;
 
-			var picDefinition = new PictureDefinition(gEntry.LibraryBook.Book.PictureLarge ?? gEntry.LibraryBook.Book.PictureId, PictureSize.Native);
-			var picDlTask = Task.Run(() => PictureStorage.GetPictureSynchronously(picDefinition));
+			var picDef = new PictureDefinition(gEntry.LibraryBook.Book.PictureLarge ?? gEntry.LibraryBook.Book.PictureId, PictureSize.Native);
+
+			void PictureCached(object sender, PictureCachedEventArgs e)
+			{
+				if (e.Definition.PictureId == picDef.PictureId)
+					imageDisplay.CoverPicture = e.Picture;
+
+				PictureStorage.PictureCached -= PictureCached;
+			}
+
+			PictureStorage.PictureCached += PictureCached;
+			(bool isDefault, byte[] initialImageBts) = PictureStorage.GetPicture(picDef);
 
-			(_, byte[] initialImageBts) = PictureStorage.GetPicture(new PictureDefinition(gEntry.LibraryBook.Book.PictureId, PictureSize._80x80));
 			var windowTitle = $"{gEntry.Title} - Cover";
 
 			if (imageDisplay is null || imageDisplay.IsDisposed || !imageDisplay.Visible)
 			{
 				imageDisplay = new GridView.ImageDisplay();
 				imageDisplay.RestoreSizeAndLocation(Configuration.Instance);
-				imageDisplay.FormClosed += (_, _) => imageDisplay.SaveSizeAndLocation(Configuration.Instance);
-				imageDisplay.Show(null);
+				imageDisplay.FormClosed += (_, _) => imageDisplay.SaveSizeAndLocation(Configuration.Instance);				
 			}
 
 			imageDisplay.BookSaveDirectory = AudibleFileStorage.Audio.GetDestinationDirectory(gEntry.LibraryBook);
 			imageDisplay.PictureFileName = System.IO.Path.GetFileName(AudibleFileStorage.Audio.GetBooksDirectoryFilename(gEntry.LibraryBook, ".jpg"));
 			imageDisplay.Text = windowTitle;
 			imageDisplay.CoverPicture = initialImageBts;
-			imageDisplay.CoverPicture = await picDlTask;
+			if (!isDefault)
+				PictureStorage.PictureCached -= PictureCached;
+
+			if (!imageDisplay.Visible)
+				imageDisplay.Show(null);
 		}
 
 		public void Description_Click(object sender, Avalonia.Interactivity.RoutedEventArgs args)
diff --git a/Source/LibationWinForms/GridView/ProductsDisplay.cs b/Source/LibationWinForms/GridView/ProductsDisplay.cs
index e7210ad0..0f30b8f5 100644
--- a/Source/LibationWinForms/GridView/ProductsDisplay.cs
+++ b/Source/LibationWinForms/GridView/ProductsDisplay.cs
@@ -31,27 +31,39 @@ namespace LibationWinForms.GridView
 		#region Button controls		
 
 		private ImageDisplay imageDisplay;
-		private async void productsGrid_CoverClicked(GridEntry liveGridEntry)
+		private void productsGrid_CoverClicked(GridEntry liveGridEntry)
 		{
-			var picDefinition = new PictureDefinition(liveGridEntry.LibraryBook.Book.PictureLarge ?? liveGridEntry.LibraryBook.Book.PictureId, PictureSize.Native);
-			var picDlTask = Task.Run(() => PictureStorage.GetPictureSynchronously(picDefinition));
+			var picDef = new PictureDefinition(liveGridEntry.LibraryBook.Book.PictureLarge ?? liveGridEntry.LibraryBook.Book.PictureId, PictureSize.Native);
+
+			void PictureCached(object sender, PictureCachedEventArgs e)
+			{
+				if (e.Definition.PictureId == picDef.PictureId)
+					imageDisplay.CoverPicture = e.Picture;
+
+				PictureStorage.PictureCached -= PictureCached;
+			}
+
+			PictureStorage.PictureCached += PictureCached;
+			(bool isDefault, byte[] initialImageBts) = PictureStorage.GetPicture(picDef);
 
-			(_, byte[] initialImageBts) = PictureStorage.GetPicture(new PictureDefinition(liveGridEntry.LibraryBook.Book.PictureId, PictureSize._80x80));
 			var windowTitle = $"{liveGridEntry.Title} - Cover";
 
 			if (imageDisplay is null || imageDisplay.IsDisposed || !imageDisplay.Visible)
 			{
-				imageDisplay = new ImageDisplay();
+				imageDisplay = new GridView.ImageDisplay();
 				imageDisplay.RestoreSizeAndLocation(Configuration.Instance);
 				imageDisplay.FormClosed += (_, _) => imageDisplay.SaveSizeAndLocation(Configuration.Instance);
-				imageDisplay.Show(this);
 			}
 
 			imageDisplay.BookSaveDirectory = AudibleFileStorage.Audio.GetDestinationDirectory(liveGridEntry.LibraryBook);
 			imageDisplay.PictureFileName = System.IO.Path.GetFileName(AudibleFileStorage.Audio.GetBooksDirectoryFilename(liveGridEntry.LibraryBook, ".jpg"));
 			imageDisplay.Text = windowTitle;
 			imageDisplay.CoverPicture = initialImageBts;
-			imageDisplay.CoverPicture = await picDlTask;
+			if (!isDefault)
+				PictureStorage.PictureCached -= PictureCached;
+
+			if (!imageDisplay.Visible)
+				imageDisplay.Show(null);
 		}
 
 		private void productsGrid_DescriptionClicked(GridEntry liveGridEntry, Rectangle cellRectangle)