BISERVER-9050 - Merging in Clean theme updates from UX