FLUID-4995: CSS cleanup