Unify tooltip.
Merge pull request #1667 from jburel/tooltip-display

Unify tooltip.