Cleaning up toolbar buttons