Added fonts and tooltip
Merge branches 'master' and 'tooltip'