CollectionDatasource refactor
New icons at detail