Added more icons and fixed a bug