I choose B.
It wouldn't matter that much, as if you have two portraits of the same name right next to each other on the portrait selection screen, it takes about 1 sec. to determine the size of each, and to put them in their slots.
__________________
|