cleaned up icons, not done though