Really fix Tomahawk buttons this time