New icons and some code cleanup
Fixed bugs in pipeline loading phase