Created by: ysds
Change the name to a "close button" for clarity and consistency.
It is free to backport this to v4.