Updated the icon font and consolidated styles.
manual merge.