Separate remove icons into remove_rule and remove_group