fix bug and add icon