Added round and square bitmaps