BISERVER-9452 - Merge in latest Onyx theme changes from UX

BISERVER-9452 - Merge in latest Onyx theme changes from UX