FLUID-4323: High contrast changes

@michelled