More css changes from ticket #14406