Icons support for Windows fixed/bugfixes