Some icon cleanups