PS4 control bug?

Anyone else have this issue, or know how to fix it?

I made a new discovery human toon, and for some reason my primary weapon fire and melee buttons (R2 and Circle, respectively) have swapped for ground combat.

I’ve tried resetting the controls, and even uninstalling and reinstalling the game, but it hasn’t fixed the issue. Looking at the controller layout, it isn’t *supposed* to be switched, and it doesn’t affect any of my other toons.

Doesn’t make the game unplayable or anything, but away missions have become rather annoying as the controls are super unnatural (after decades of playing on PlayStation). Anyone have any ideas?