Moved around some icon files and eliminated some duplicates.