added icons
Merge branch 'master' into navbar_mobile