Icon was not always displayed in Windows menu
Preparation of 0.6 release
Clean up