Update the two_state_template widget to use the new icon system and update all the instances where it is used