BISERVER-8947 - More Crystal theme tweaks merged in from UX