separating launcher and actionbar icons
using correct actionbar icon
refactored shared settings to application class
Merge branch 'master' into lite-2.3
updated 2.3.1 assets
Merge branch 'master' into lite-2.3