Reformatting, and an icon fix.