Also updating the toolbar buttons because those weren't correct either