Reorganize navigation (#362)

Update icons, remove contact and fix other minor things in the main
menu.

Change-Id: I2fbd170ff530b3f442670ab0d36021c3ede70383
Merge "Reorganize navigation (#362)"