Fixed with static init of icons
Merge branch 'master' into rft-extend-plt