Clear and simplify icons code