#1916

Fix chrome issue
Fix Rockettheme arrow issue
Merge pull request #1965 from 810/master-fix-1

Issue #1916