Improve action bar pr 392 with develop