cleanups and optimizations
+ source plugin icons