Fix up button error and add icon