I have been using these shapes for my architecture designs after getting tired of using shapes that based on Vista.  These are more modern shapes and includes two variations for servers and alternative shapes for most roles in Configmgr to fit different styles.  I have included some other miscellaneous shapes and shapes for containers, BranchCache, PeerCache, Nano server and others.  In total, there are about 125 different shapes.

Configmgr vNext Shapes

Configmgr-vNext-Shapes-v1.0

Also on TechNet here