Stop making separate gendered toilets. Toilets just need floor to ceiling stalls with actual doors. No urinals (yuck) and then a row of sinks.

This is already the case in practically any Swedish white collar workplace.

Just do individual bathrooms you can close. Everyone prefers them anyway, why wouldn’t you want to have an entire space you can lock down and do your business and move at your own pace?

Unless you’re really into wiping piss of toilet seats you want there to be some urinals.

Or have education about how much piss goes everywhere when you pee. In Germany most men sit to pee most of the time, it is a cultural issue and can be changed. That said, if you do urinals, make them stalls too, I don’t want to chat with my pee neighbour.