Icon improvements for Windows