Round 3, clean up .desktop files and xpm icons in templates