Added automatic handling of dismissIcon