Add icons to navigation drawer
Fix merge conflicts
Fix merge conflicts