Re-structure font-awesome