Icons and TODO for MenuIntro
Merge remote-tracking branch 'origin/master'