fix remove icon
fix remove and add pagination