[Bug 1045] - Toolbar icon bitmaps incorrectly rendered