Icons fix for batch runner
Icon cleanups