Optimizations and new Icons