More icon stuff.

Related to #60.