Added more icon matchers. Cleaned up CSS a bit.

Cool.