Cleanup un-needed icons and adjust a few