Merge branch 'navbar'
added icons
added search icon
Merge remote-tracking branch 'origin/master' into navbar