If we keep the units in the same spot there's no point in the new button
Discussion
Imo button is good, remove all other touch input to change currency and keep all currency icons on the right, that way it’s simple, you know you need to tap that to change it, and you won’t tap it accidentally(I actually do that a lot atm)