Concerning expanding and collapsing: please don't move the icons when you expand or collapse.

If they stay in the same place, you're able to open and close them with a double click.