Merge "Change treeview leaf icon to be less visible"