Re-factor due to font awesome changes