Icons on nav
Merged and fixed conflicts