expand/collapse and node icons
expand/collapse and node icons #2