Icons added and optimized