Invoice address uses different fields than delivery address

[kkarzel]

Hi All, 

So I have this problem - I've imported a Polish localisation package in International > Location settings. I've later selected which fields should show up in delivery address form and added things like VAT number ("Numer NIP"). In the shop it all looks fine:

The challange starts when I want to use a different invoice address. Then for some reason a default address form is used and I don't have fields like VAT number and the country is set by default to USA which also adds a mandatory field - State ("Państwo"): 

 

Is it possible to have the same selection of address fields in both addresses the delivery and the invoice ones?

 

All the best, Krzysztof