Cleanup after Font Awesome upgrade
Fixing conflict