Added more icon types.