Updated UI and icon