Bug 1811937 - Update the clear button to use the latest design