Some cleanup.
Allow setting a custom icon.