Fixed with static init of icons
Merge branch 'master' into MSW-130