Remove JCB Japanese credit card logo

Also reorder credit card logos so AmEx before Discover

[Finishes #42020359]