Netflix will be getting its own dedicated button on TiVo’s remote controls, as part of product and patent-licensing agreements set by the two companies.

The duo’s product agreement calls for TiVo to continue integrating Netflix into TiVo set-tops available from pay-TV providers and at retail. That will include unified search across the content catalog and a Netflix button on TiVo remotes.

TiVo was acquired by entertainment-technology provider Rovi for $1.1 billion this year, and the merged company adopted the TiVo name. Both Rovi and TiVo historically have engaged in aggressive patent litigation. Rovi had sued Netflix alleging it infringed five its its patents — but the streaming provider won a victory in the case last year after a U.S. federal judge ruled the Rovi-owned patents at issue were invalid.

The litigation between Netflix and Rovi is now all water under the bridge. Under a separate agreement announced Monday, Netflix has acquired a license to TiVo’s patent portfolios as well as a license to the portfolio for over-the-top services from patent holding company Intellectual Ventures. Rovi formed a partnership with Intellectual Ventures earlier this year to pool their OTT-related patents.

TiVo and Rovi together have over 6,000 issued patents and pending applications worldwide, including patents covering DVR and interactive program guide functions.

“The partnership between Netflix and TiVo dates back to our early days of streaming video,” Bill Holmes, Netflix global head of business development, said in a statement. “Building on this history, the agreements provide consumers freedom to watch their favorite TV shows and movies whenever and wherever, with an integrated experience across more devices.”