Made icon switcher work for all viewonly and viewtoggle calls