fix tooltip .. again
Merge pull request #3952 from negue/tooltip_fix_part2

2nd Try to fix Avatar tooltips