NXP-15172: keep same icon for node expanded/collapsed + add leaf control