Merge branch 'gh-pages'
Fixing arrow icons
Merge branch 'master' into gh-pages