Some more updates to icons and colors