An improvement of 5f0dcf79,
which, depending on theme, had an issue with
drawing the top border clipped inside the header.