Updates for testing on Mac OS X.

Mime types on Mac OS X seems to return a slightly different type
for icon image files, so add that to the acceptable list.