added icons, like home/settings/etc
minor fix to prev
Merge remote-tracking branch 'origin/eric' into bala