* Add children and remove nullified icon

* Revert data format with children

* Update test

* Revert styles

* Update types