bugfix(collection_form) New markup for icon buttons