Re-factor / change help icon closes item:353