Fix ugly icon in Windows setup
Merge branch 'develop' into feature/webdavssl2