BISERVER-9050 - Merging in Crystal theme updates from UX

BISERVER-9050 - Merging in Crystal theme updates from UX