New nav drawer, new icons, updated buttons
Conflict resolve