Update for b26 and added a clean up icon.