separating launcher and actionbar icons
using correct actionbar icon
refactored shared settings to application class
updated 2.3.1 assets