Issue #21889: More css fixes