fix SWC-1544, and Loading, and header icons