Change to use refresh & checkbox icon.
Remove unused code.