Add Windows icons
Merge branch 'release-1.2.x'