Added toggling of icon when toolbar icon clicked