Make toolbar layout fix more robust by adding the padding as a bar button item. Otherwise the buttons may get repositioned after being tapped.