Modal + "remove icon" updates