BISERVER-8947 - merging in more Crystal theme changes from UX