Added more icons.
Pretty much a rewrite.