Only covered about half of the types so far. This also removes the clustering, since that doesn't really seem to be needed with the newer icons.
Dan Albert
