Added font-icon and small fixes