Tooltip avatar logic updated.