diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index b626584942a..17b267dda77 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -2253,6 +2253,7 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT i, HICON hIcon)
     BITMAP  bmp;
     BOOL    ret;
     POINT   pt;
+    INT     i;
 
     TRACE("(%p %d %p)\n", himl, i, hIcon);
 
@@ -2317,14 +2318,17 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT i, HICON hIcon)
     SetBkColor  (himl->hdcImage, RGB(255,255,255));
     hbmOldSrc = SelectObject (hdcImage, ii.hbmColor);
 
-    imagelist_point_from_index(himl, nIndex, &pt);
-    StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy,
-                  hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY);
+    for (i=0; i<(bmp.bmWidth/himl->cx); i++) {
 
-    if (himl->hbmMask) {
-        SelectObject (hdcImage, ii.hbmMask);
-        StretchBlt   (himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy,
-                      hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY);
+        imagelist_point_from_index(himl, nIndex+i, &pt);
+        StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy,
+                      hdcImage, 0, 0, himl->cx*i, bmp.bmHeight, SRCCOPY);
+
+        if (himl->hbmMask) {
+            SelectObject (hdcImage, ii.hbmMask);
+            StretchBlt   (himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy,
+                          hdcImage, 0, 0, himl->cx*i, bmp.bmHeight, SRCCOPY);
+        }
     }
 
     SelectObject (hdcImage, hbmOldSrc);