Here's a thought: If we, as an industry, started to move
away from this "everyone in one big shared bullpen" / open-plan model, and started giving people individual offices again, would that make things better? Because now, you, as, say, a female programmer, are free to decorate your office in pink and with "Sex In The City" posters, and issues of Cosmo or whatever (if that's what floats your boat) while your co-worker can have Doctor Who and Star Wars posters, and electronics magazines, blah, blah (or vice versa).
Personally I think that one of the best way to accomodate the uniqueness that makes us all individuals, is to embrace that individual nature and give people solo offices. Of course, that's not the only reason I advocate for private offices, but it's hard not to think that it would help in this regard as well.