Removed bitmaps and fixed icons.