Disagreements with toddler!

We are trying to raise an assertive child. However, that means that the toddlers an opinion about everything he uses, inclusing nappies! For instance, we get 2 different designs in the diaper pack. He would readily wear the one with elephants on it, but throws a big fit when he has to wear the fox one! Same thing when it comes to clothes, socks (he chooses 2 different ones). I don't want to scold him, as it is quite trivial. He is a really well-behaved child otherwise. How to best deal with this is a question. Appreciate your inputs!