Final Cleanups with icons