New expando icons
Reformatted