More color cleanup and fixes
No need for site icon field

They're all named the same, no need for complicated site specific icon field.