Regression in icons displayed after commit 0.4.14-dev-459-gcfdbccf

In Revision 76032 ReactOS could display icons from files that contained PNG ones along with normal ones. After the commit of cfdbccf, any icon file that has these both is only displayed as an IDI_SHELL_DOCUMENT.
See the code in ReactO\reactos\dll\win32\shell32\folders\CFSFolder.cpp about Line # 317.
This shows up well when looking at a normal ReactOS install in the following directory:
C:\Documents and Settings\Administrator\Local Settings\Application Data\rapps\rapps\icons.

I copied the icon folder from our new install back into the
old Revision 76032 to show the difference. See below for a comparison.

I am working on a proposed solution, but it is not finished yet.
A PR will follow when I have a good fix for this.
This guilt commit is 0.4.14-dev-459-gcfdbccf by katayama_hirofumi_mz.

I have attached a 7z file with the icons in it for testing here: icons.7z