Add icons to menu
Merge branch 'dev' into Richard
Fix JS merge conflicts