Issue #22628: Increase Treewidge line spacing so lines do not overlap.
Move test lines up with respect to icons.
Merge with 3.4 Issue #22628