Reorganized icons