Added icon toggle; multiple icons