[Bug 24301] New: ICO parsing improvements