Swapped out FontawesomeText with normal ImageView
Added unlock icon, fixed drawer items, switched to icons from resource in drawer
Switched to the dark icons
Merge remote-tracking branch 'upstream/master'
Merge pull request #699 from da-kid/master

Partial fix for #597 (Navbar)