Fixed problem of icons not been clickable in some pages
Merge branch 'hotfix'