Add tab icons and change tab color to orange
Merge remote-tracking branch 'origin/master' into iOS-UI