icons, branding, cleanup, etc