Re-worked the icon logic for expanding the tree