3 files changed, 9 insertions, 4 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 0f989133..8e4e2752 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -944,7 +944,7 @@ static void updateWindowTitle_DocumentWidget_(const iDocumentWidget *d) {
         pushBackCStr_StringArray(title, "Lagrange");
     }
     /* Take away parts if it doesn't fit. */
-    const int avail     = bounds_Widget(as_Widget(tabButton)).size.x - 3 * gap_UI;
+    const int avail     = bounds_Widget(as_Widget(tabButton)).size.x - 7 * gap_UI;
     iBool     setWindow = (document_App() == d && isUnderKeyRoot_Widget(d));
     const int font      = uiLabel_FontId;
     for (;;) {
diff --git a/src/ui/root.c b/src/ui/root.c
index f6d6f11d..ba8d95ee 100644
--- a/src/ui/root.c
+++ b/src/ui/root.c
@@ -1281,7 +1281,9 @@ void createUserInterface_Root(iRoot *d) {
         iWidget *docTabs = makeTabs_Widget(mainStack);
         setId_Widget(docTabs, "doctabs");
         setBackgroundColor_Widget(docTabs, uiBackground_ColorId);
-        appendTabPage_Widget(docTabs, iClob(new_DocumentWidget()), "Document", 0, 0);
+        iDocumentWidget *doc;
+        appendTabPage_Widget(docTabs, iClob(doc = new_DocumentWidget()), "Document", 0, 0);
+        addTabCloseButton_Widget(docTabs, as_Widget(doc), "tabs.close");
         iWidget *buttons = findChild_Widget(docTabs, "tabs.buttons");
         setFlags_Widget(buttons, collapse_WidgetFlag | hidden_WidgetFlag |
                                      drawBackgroundToHorizontalSafeArea_WidgetFlag, iTrue);
diff --git a/src/ui/util.c b/src/ui/util.c
index 5f6d0331..55adeffc 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1451,14 +1451,17 @@ static iLabelWidget *tabButtonForPage_Widget_(iWidget *tabs, const iWidget *page
 void addTabCloseButton_Widget(iWidget *tabs, const iWidget *page, const char *command) {
     iLabelWidget *tabButton = tabButtonForPage_Widget_(tabs, page);
 //    setPadding1_Widget(as_Widget(tabButton), gap_UI / 8);
+    setPadding_Widget(as_Widget(tabButton), 0, 0, 0, gap_UI / 4);
+    setFlags_Widget(as_Widget(tabButton), arrangeVertical_WidgetFlag | resizeHeightOfChildren_WidgetFlag, iTrue);
     iLabelWidget *close     = addChildFlags_Widget(
         as_Widget(tabButton),
         iClob(new_LabelWidget(close_Icon,
                               format_CStr("%s id:%s", command, cstr_String(id_Widget(page))))),
         moveToParentRightEdge_WidgetFlag | tight_WidgetFlag | frameless_WidgetFlag |
-            hidden_WidgetFlag | visibleOnParentHover_WidgetFlag);
+            noBackground_WidgetFlag | hidden_WidgetFlag | visibleOnParentHover_WidgetFlag);
+    setNoAutoMinHeight_LabelWidget(close, iTrue);
     updateSize_LabelWidget(close);
-    printTree_Widget(tabs);
+//    printTree_Widget(tabs);
 }
 
 void showTabPage_Widget(iWidget *tabs, const iWidget *page) {