Goodwill, and intellectual property (such as patents, trademarks, and copyrights) are all forms of intangible assets which are non-current. One can argue that trademarks form part of good will. This is not technically wrong but should be considered on a case by case basis.