add switch and new icon.