Merge pull request #6811 from agh1/fa-icons