Jon Kopaloff/FilmMagic/Getty Images

After some heated bickering from both sides, Melissa Etheridge and her former spouse, Tammy Lynn Michaels, have reached an agreement in their custody battle.

TMZ.com reports that the ex-couple will share joint custody of their five-year-old twins. Michaels will also earn an unspecified increase in partner and child support; she'd been getting $23,000 per month prior to this settlement.

In separate court filings last month, Michaels claimed Etheridge taught their twins to treat her poorly, while the musician alleged Michaels is an "angry and vindictive" woman.

Etheridge and Michaels split in 2010.