Optimized code and added icon