add icon and solve small problems