Change some icons
Deal with filenames