the icons and style for the app
Merge remote-tracking branch 'origin/master'