gfx clean up and merged in icons png