action bar icons and chat
merge