issue #19453: More UI tweaks.