Propagated changes to icons used on home screen and nav bar from 1.1 branch to master.