add icons, delete switch handler
wtf