Updated icons and optimized