[Bug 24301] ICO parsing improvements