ThemeMagic: Fix tooltip, font awesome
Merge conflict