Hope last fix for windows7 ...
Merge branch 'feature-multi-icon'