Added icons and user state changes