Remove test export_icon call
Add icon selection and fix handling of name prefixes