Placeholders for menu icons
Setup menu icons to show appropriate content
Merge branch 'dev' into Richard