gfx fixes for color & icons