Updated icon and some work to use BBufferGroup in Core.