Fixed template-naming, added icons
Remove old export-options