No Second Prances, the sixth episode of Season Six was originally aired on April 30, 2016.

In this episode, when Starlight Glimmer becomes friends with Trixie, Twilight Sparkle disapproves.

Trivia

All Bottled Up, the second episode of Season Seven was originally aired on April 15, 2017.

In this episode, Starlight Glimmer and Trixie accidentally make the Cutie Map disappear while the Mane Six are on a friendship retreat, so Starlight uses a spell to bottle up her anger until the map is retrieved.

It also features the song, Best Friends Until the End of Time, which is the first song of season seven.