added default icons and reordered for organization