Merged changes from Andy Hicks, mostly having to do with createImageIcon.