core-4640 update help icon and refactor code.