Update toolbar icon switching to use events