We can now search in the Tree:

But the icons are not well organized, how to make it easier/cleaner more intuitive ?