Re-added buggyfix, will fix font awesome tomorrow