Fix redirection and icons - refs #7296