yeah, I'm having problems fitting some of mine, too...so I just don't use them.
But now if you try changing them one right after another, some screens show up with one avatar and other screens show up with another. To get them all in synch, you can't switch them out as fast as you used to be able to. Oh well, I'll be changing it before long anyway.