diff --git a/DataClasses/RowData.cs b/DataClasses/RowData.cs
index 32d3cd5..f3eb64a 100644
--- a/DataClasses/RowData.cs
+++ b/DataClasses/RowData.cs
@@ -303,8 +303,7 @@ namespace SystemTrayMenu.DataClasses
                     {
                         try
                         {
-                            icon = IconReader.GetFileIconWithCache(iconLocation, true, out bool toDispose);
-                            diposeIcon = toDispose;
+                            icon = Icon.ExtractAssociatedIcon(iconLocation);
                             handled = true;
                         }
                         catch (ArgumentException ex)
@@ -341,8 +340,7 @@ namespace SystemTrayMenu.DataClasses
                 }
                 else if (System.IO.File.Exists(iconFile))
                 {
-                    icon = IconReader.GetFileIconWithCache(iconFile, true, out bool toDispose);
-                    diposeIcon = toDispose;
+                    icon = Icon.ExtractAssociatedIcon(iconFile);
                     handled = true;
                 }
                 else
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
index 346c93e..8a42f45 100644
--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -39,5 +39,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.17.40")]
-[assembly: AssemblyFileVersion("1.0.17.40")]
+[assembly: AssemblyVersion("1.0.17.41")]
+[assembly: AssemblyFileVersion("1.0.17.41")]