She actually SAYS, with a speech bubble, which weapon she's switching to. changing the order of when the buff on her is applied seems silly for something that is literally telegraphed with "IMMA WHACKAYOU WIT MAH SWORD!" Especially since the speech bubbles are bigger than your buff icons.
I'm all for a bit of color pop on the circles (though I'm one of those that doesn't need them) but switching the order or timing of something can cause some serious problems, even if it's only half a second.
