diff --git a/samples/NotificationFlyoutSample/Assets/Icon-Light.ico b/samples/NotificationFlyoutSample/Assets/Icon-Light.ico
deleted file mode 100644
index 5c7e7a8..0000000
Binary files a/samples/NotificationFlyoutSample/Assets/Icon-Light.ico and /dev/null differ
diff --git a/samples/NotificationFlyoutSample/Assets/Icon.ico b/samples/NotificationFlyoutSample/Assets/Icon.ico
deleted file mode 100644
index 6375e26..0000000
Binary files a/samples/NotificationFlyoutSample/Assets/Icon.ico and /dev/null differ
diff --git a/samples/NotificationFlyoutSample/Assets/notification-icon-light.png b/samples/NotificationFlyoutSample/Assets/notification-icon-light.png
new file mode 100644
index 0000000..051e167
Binary files /dev/null and b/samples/NotificationFlyoutSample/Assets/notification-icon-light.png differ
diff --git a/samples/NotificationFlyoutSample/Assets/notification-icon.png b/samples/NotificationFlyoutSample/Assets/notification-icon.png
new file mode 100644
index 0000000..f6c45e0
Binary files /dev/null and b/samples/NotificationFlyoutSample/Assets/notification-icon.png differ
diff --git a/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj b/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj
index 76ef38b..effc777 100644
--- a/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj
+++ b/samples/NotificationFlyoutSample/NotificationFlyoutSample.csproj
@@ -133,8 +133,8 @@
     </AppxManifest>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Assets\Icon-Light.ico" />
-    <Content Include="Assets\Icon.ico" />
+    <Content Include="Assets\notification-icon-light.png" />
+    <Content Include="Assets\notification-icon.png" />
     <Content Include="Properties\Default.rd.xml" />
     <Content Include="Assets\LockScreenLogo.scale-200.png" />
     <Content Include="Assets\SplashScreen.scale-200.png" />
diff --git a/samples/NotificationFlyoutSample/Shell.xaml b/samples/NotificationFlyoutSample/Shell.xaml
index f386b57..7145d8e 100644
--- a/samples/NotificationFlyoutSample/Shell.xaml
+++ b/samples/NotificationFlyoutSample/Shell.xaml
@@ -3,7 +3,9 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:controls="using:TheXamlGuy.NotificationFlyout.Uwp.UI.Controls"
-    xmlns:muxc="using:Microsoft.UI.Xaml.Controls">
+    xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+    IconSource="/Assets/notification-icon.png"
+    LightIconSource="/Assets/notification-icon-light.png">
     <controls:NotificationFlyout.FlyoutPresenterStyle>
         <Style TargetType="controls:NotificationFlyoutPresenter">
             <Setter Property="CornerRadius" Value="8" />
diff --git a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ImageSourceExtensions.cs b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ImageSourceExtensions.cs
index f82595e..78b92df 100644
--- a/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ImageSourceExtensions.cs
+++ b/src/TheXamlGuy.NotificationFlyout.Shared.UI/Extensions/ImageSourceExtensions.cs
@@ -18,16 +18,25 @@ namespace TheXamlGuy.NotificationFlyout.Shared.UI.Extensions
                 var uri = $"{AppDomain.CurrentDomain.BaseDirectory}{bitmapImage.UriSour‌​ce}".Replace("ms-appx:///", "").Replace("/", "\\");
 
                 using var stream = File.OpenRead(uri);
-                return new Icon(stream, new Size(PInvoke.GetSystemMetricsForDpi((int)SystemMetricFlag.SM_CXICON, dpi), PInvoke.GetSystemMetricsForDpi((int)SystemMetricFlag.SM_CYICON, dpi)));
+                return ExtractIcon(dpi, stream);
             }
             else
             {
                 var storageFile = await Windows.Storage.StorageFile.GetFileFromApplicationUriAsync(bitmapImage.UriSource);
+
                 using var stream = await storageFile.OpenStreamForReadAsync();
-                return new Icon(stream, new Size(PInvoke.GetSystemMetricsForDpi((int)SystemMetricFlag.SM_CXICON, dpi), PInvoke.GetSystemMetricsForDpi((int)SystemMetricFlag.SM_CYICON, dpi)));
+                return ExtractIcon(dpi, stream);
             }
         }
 
+        private static Icon ExtractIcon(uint dpi, Stream stream)
+        {
+            var bitmap = (Bitmap)Image.FromStream(stream);
+            var icon = Icon.FromHandle(bitmap.GetHicon());
+
+            return new Icon(icon, new Size(PInvoke.GetSystemMetricsForDpi((int)SystemMetricFlag.SM_CXICON, dpi), PInvoke.GetSystemMetricsForDpi((int)SystemMetricFlag.SM_CYICON, dpi)));
+        }
+
         private enum SystemMetricFlag : int
         {
             SM_CXICON = 11,