Issue #20715: More css fixes