Preserve some space around the close button so it doesn't look like butt

Addresses issue where heading is wide enough to almost touch close button

Change-Id: I25ab6ca0946d197a844140a11a1fee6cfcc28dee