Some changes and icon