Close button size
Merge branch 'base-from-develop' into test