Updated namespaces.

Also new icon.