Updated icons and selection state