Adding icon and font.
Merge branch 'aramzs-dev' into rioht-branch