diff --git a/lcl/imglist.pp b/lcl/imglist.pp
index 7b68d65abd..27aac1a268 100644
--- a/lcl/imglist.pp
+++ b/lcl/imglist.pp
@@ -259,7 +259,7 @@ type
     function GetHeightForPPI(AImageWidth, APPI: Integer): Integer;
     function GetCount: Integer;
     function GetSizeForPPI(AImageWidth, APPI: Integer): TSize;
-    function GetBestIconIndexForSize(AIcon: TCustomIcon; AWidth: Integer): Integer;
+    function GetBestIconIndexForSize(AIcon: TCustomIcon; AWidth: Integer): Integer; // the icon must be sorted
     function GetResolutionByIndex(AIndex: Integer): TCustomImageListResolution;
     function GetResolutionCount: Integer;
     procedure CreateDefaultResolution;
diff --git a/lcl/include/imglist.inc b/lcl/include/imglist.inc
index 865624c72b..4b9e5f661f 100644
--- a/lcl/include/imglist.inc
+++ b/lcl/include/imglist.inc
@@ -1743,20 +1743,28 @@ var
   R: TCustomImageListResolution;
   ScBmp: TRGBAQuadArray;
   msk: HBITMAP;
+  SortedIcon: TIcon;
 begin
   if AIcon = nil then Exit;
 
   CreateDefaultResolution;
-  for R in Resolutions do
-  begin
-    AIcon.Current := GetBestIconIndexForSize(AIcon, R.Width);
-    if AIcon.Masked then
-      msk := AIcon.MaskHandle
-    else
-      msk := 0;
-    ScaleImage(AIcon.BitmapHandle, msk,
-      AIcon.Width, AIcon.Height, R.Width, R.Height, ScBmp);
-    R.InternalInsert(AIndex, @ScBmp[0]);
+  SortedIcon := TIcon.Create;
+  try
+    SortedIcon.Assign(AIcon);
+    SortedIcon.Sort;
+    for R in Resolutions do
+    begin
+      SortedIcon.Current := GetBestIconIndexForSize(SortedIcon, R.Width);
+      if SortedIcon.Masked then
+        msk := SortedIcon.MaskHandle
+      else
+        msk := 0;
+      ScaleImage(SortedIcon.BitmapHandle, msk,
+        SortedIcon.Width, SortedIcon.Height, R.Width, R.Height, ScBmp);
+      R.InternalInsert(AIndex, @ScBmp[0]);
+    end;
+  finally
+    SortedIcon.Free;
   end;
 end;
 
@@ -2207,19 +2215,27 @@ var
   R: TCustomImageListResolution;
   ScBmp: TRGBAQuadArray;
   msk: HBITMAP;
+  SortedIcon: TIcon;
 begin
   if AIcon = nil then Exit;
 
-  for R in Resolutions do
-  begin
-    AIcon.Current := GetBestIconIndexForSize(AIcon, R.Width);
-    if AIcon.Masked then
-      msk := AIcon.MaskHandle
-    else
-      msk := 0;
-    ScaleImage(AIcon.BitmapHandle, msk,
-      AIcon.Width, AIcon.Height, R.Width, R.Height, ScBmp);
-    R.InternalReplace(AIndex, @ScBmp[0]);
+  SortedIcon := TIcon.Create;
+  try
+    SortedIcon.Assign(AIcon);
+    SortedIcon.Sort;
+    for R in Resolutions do
+    begin
+      SortedIcon.Current := GetBestIconIndexForSize(SortedIcon, R.Width);
+      if SortedIcon.Masked then
+        msk := SortedIcon.MaskHandle
+      else
+        msk := 0;
+      ScaleImage(SortedIcon.BitmapHandle, msk,
+        SortedIcon.Width, SortedIcon.Height, R.Width, R.Height, ScBmp);
+      R.InternalReplace(AIndex, @ScBmp[0]);
+    end;
+  finally
+    SortedIcon.Free;
   end;
 end;