trivial tidy
Backport of exchange work
back port of tooltip font changes