add icons as nodes, fix collapse
update before data change branch