Tree search and icon corrections