fix clear, change button order, add icon to clear