Trying to fix toolbar buttons