Updating icons and logic