21 files changed, 26 insertions, 8 deletions

diff --git a/po/en.po b/po/en.po
index cc6ea545..daa90212 100644
--- a/po/en.po
+++ b/po/en.po
@@ -348,6 +348,9 @@ msgstr "About Pages"
 msgid "menu.about"
 msgstr "About"
 
+msgid "menu.fonts"
+msgstr "Manage Fonts…"
+
 msgid "panel.back"
 msgstr "Back"
 
diff --git a/res/lang/de.bin b/res/lang/de.bin
index e6b1bf85..6ee5d613 100644
--- a/res/lang/de.bin
+++ b/res/lang/de.bin
diff --git a/res/lang/en.bin b/res/lang/en.bin
index 2ef67f55..ec84c294 100644
--- a/res/lang/en.bin
+++ b/res/lang/en.bin
diff --git a/res/lang/eo.bin b/res/lang/eo.bin
index 89ec6fea..d90d530d 100644
--- a/res/lang/eo.bin
+++ b/res/lang/eo.bin
diff --git a/res/lang/es.bin b/res/lang/es.bin
index 701f0478..c7789568 100644
--- a/res/lang/es.bin
+++ b/res/lang/es.bin
diff --git a/res/lang/es_MX.bin b/res/lang/es_MX.bin
index 3013590a..104ac165 100644
--- a/res/lang/es_MX.bin
+++ b/res/lang/es_MX.bin
diff --git a/res/lang/fi.bin b/res/lang/fi.bin
index edc0df2b..ad15d58d 100644
--- a/res/lang/fi.bin
+++ b/res/lang/fi.bin
diff --git a/res/lang/fr.bin b/res/lang/fr.bin
index c4b482de..7fd5ecc1 100644
--- a/res/lang/fr.bin
+++ b/res/lang/fr.bin
diff --git a/res/lang/gl.bin b/res/lang/gl.bin
index 6b1ca49a..ede1891e 100644
--- a/res/lang/gl.bin
+++ b/res/lang/gl.bin
diff --git a/res/lang/ia.bin b/res/lang/ia.bin
index 7f677aab..a1e7994e 100644
--- a/res/lang/ia.bin
+++ b/res/lang/ia.bin
diff --git a/res/lang/ie.bin b/res/lang/ie.bin
index 6488b20f..cd2ba268 100644
--- a/res/lang/ie.bin
+++ b/res/lang/ie.bin
diff --git a/res/lang/isv.bin b/res/lang/isv.bin
index 0f783c31..6b6884c5 100644
--- a/res/lang/isv.bin
+++ b/res/lang/isv.bin
diff --git a/res/lang/pl.bin b/res/lang/pl.bin
index e2d8bc6a..2808106a 100644
--- a/res/lang/pl.bin
+++ b/res/lang/pl.bin
diff --git a/res/lang/ru.bin b/res/lang/ru.bin
index a0f75c6c..cf51f0c1 100644
--- a/res/lang/ru.bin
+++ b/res/lang/ru.bin
diff --git a/res/lang/sk.bin b/res/lang/sk.bin
index 91bd1358..18cf1190 100644
--- a/res/lang/sk.bin
+++ b/res/lang/sk.bin
diff --git a/res/lang/sr.bin b/res/lang/sr.bin
index 55a289bd..d0d4eac5 100644
--- a/res/lang/sr.bin
+++ b/res/lang/sr.bin
diff --git a/res/lang/tok.bin b/res/lang/tok.bin
index 938f85d4..e69c6164 100644
--- a/res/lang/tok.bin
+++ b/res/lang/tok.bin
diff --git a/res/lang/zh_Hans.bin b/res/lang/zh_Hans.bin
index c6beace1..0c2a98ad 100644
--- a/res/lang/zh_Hans.bin
+++ b/res/lang/zh_Hans.bin
diff --git a/res/lang/zh_Hant.bin b/res/lang/zh_Hant.bin
index 20128ba3..a776b3e7 100644
--- a/res/lang/zh_Hant.bin
+++ b/res/lang/zh_Hant.bin
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index e4fe9d5f..fbcd24b9 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -268,7 +268,7 @@ static void getColors_LabelWidget_(const iLabelWidget *d, int *bg, int *fg, int
         }
     }
     if (d->forceFg >= 0) {
-        *fg = *icon = *meta = d->forceFg;
+        *fg = /* *icon = */ *meta = d->forceFg;
     }
     if (isPress) {
         if (colorEscape == uiTextAction_ColorId || colorEscape == uiTextCaution_ColorId) {
diff --git a/src/ui/util.c b/src/ui/util.c
index 55adeffc..994f4671 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1449,19 +1449,24 @@ static iLabelWidget *tabButtonForPage_Widget_(iWidget *tabs, const iWidget *page
 }
 
 void addTabCloseButton_Widget(iWidget *tabs, const iWidget *page, const char *command) {
+    if (deviceType_App() == phone_AppDeviceType) {
+        return; /* Close buttons not used on a phone due to lack of space. */
+    }
     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(
+    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 |
             noBackground_WidgetFlag | hidden_WidgetFlag | visibleOnParentHover_WidgetFlag);
+    if (deviceType_App() != desktop_AppDeviceType) {
+        setFlags_Widget(as_Widget(close),
+                        hidden_WidgetFlag | visibleOnParentHover_WidgetFlag, iFalse);
+    }
     setNoAutoMinHeight_LabelWidget(close, iTrue);
     updateSize_LabelWidget(close);
-//    printTree_Widget(tabs);
 }
 
 void showTabPage_Widget(iWidget *tabs, const iWidget *page) {
@@ -2259,6 +2264,7 @@ iWidget *makePreferences_Widget(void) {
             { NULL }  
         };
         const iMenuItem boldLinkItems[] = {
+            { "button id:prefs.boldlink.visited" },
             { "button id:prefs.boldlink.dark" },
             { "button id:prefs.boldlink.light" },
             { NULL }  
@@ -2273,6 +2279,7 @@ iWidget *makePreferences_Widget(void) {
             { "heading text:${prefs.searchurl}" },
             { "input id:prefs.searchurl url:1 noheading:1" },
             { "padding" },
+            { "toggle id:prefs.bookmarks.addbottom" },
             { "toggle id:prefs.archive.openindex" },
             { "radio device:1 id:prefs.pinsplit", 0, 0, (const void *) pinSplitItems },
             { "padding" },
@@ -2305,10 +2312,17 @@ iWidget *makePreferences_Widget(void) {
         };
         const iMenuItem fontPanelItems[] = {
             { "title id:heading.prefs.fonts" },
-            { "dropdown id:prefs.headingfont", 0, 0, (const void *) constData_Array(makeFontItems_("headingfont")) },
-            { "dropdown id:prefs.font", 0, 0, (const void *) constData_Array(makeFontItems_("font")) },
+            { "dropdown id:prefs.font.heading", 0, 0, (const void *) constData_Array(makeFontItems_("heading")) },
+            { "dropdown id:prefs.font.body", 0, 0, (const void *) constData_Array(makeFontItems_("body")) },
+            { "dropdown id:prefs.font.mono", 0, 0, (const void *) constData_Array(makeFontItems_("mono")) },
             { "buttons id:prefs.mono", 0, 0, (const void *) monoFontItems },
-            { "buttons id:prefs.boldlink", 0, 0, (const void *) boldLinkItems },
+            { "dropdown id:prefs.font.monodoc", 0, 0, (const void *) constData_Array(makeFontItems_("monodoc")) },
+            { "padding" },
+            { "toggle id:prefs.font.smooth" },
+            { "padding" },
+            { "dropdown id:prefs.font.ui", 0, 0, (const void *) constData_Array(makeFontItems_("ui")) },
+            { "padding" },
+            { "button text:" fontpack_Icon " ${menu.fonts}", 0, 0, "!open url:about:fonts" },
             { NULL }  
         };
         const iMenuItem stylePanelItems[] = {
@@ -2317,6 +2331,7 @@ iWidget *makePreferences_Widget(void) {
             { "padding" },
             { "input id:prefs.linespacing maxlen:5" },
             { "radio id:prefs.quoteicon", 0, 0, (const void *) quoteItems },
+            { "buttons id:prefs.boldlink", 0, 0, (const void *) boldLinkItems },
             { "padding" },
             { "toggle id:prefs.biglede" },
             { "toggle id:prefs.plaintext.wrap" },
@@ -2582,8 +2597,8 @@ iWidget *makePreferences_Widget(void) {
             addChildFlags_Widget(values, iClob(ansi), arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag);
             addDialogToggle_(headings, values, "${prefs.font.smooth}", "prefs.font.smooth");
             addDialogPadding_(headings, values);
-            addFontButtons_(values, "ui");
             addChild_Widget(headings, iClob(makeHeading_Widget("${prefs.font.ui}")));
+            addFontButtons_(values, "ui");
             //            addDialogPadding_(headings, values);
 //            /* Custom font. */ {
 //                iInputWidget *customFont = new_InputWidget(0);