I think it might be possible to replace some of the logic in toolbar with correct DrawIndirect() arguments, potentially fixing or extending Imagelist() implementation. For example, does it need to check 'has_alpha' on every draw or could imagelist do that once, until bitmap is replaced.