Add icon and better success message