Icon updates and switch button added.