3 files changed, 15 insertions, 8 deletions

diff --git a/src/ui/mobile.c b/src/ui/mobile.c
index abc91218..7b34d389 100644
--- a/src/ui/mobile.c
+++ b/src/ui/mobile.c
@@ -515,6 +515,7 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
     }
     else if (equal_Command(spec, "radio") || equal_Command(spec, "buttons")) {
         const iBool isRadio = equal_Command(spec, "radio");
+        const iBool isHorizontal = argLabel_Command(spec, "horizontal");
         addChild_Widget(panel, iClob(makePadding_Widget(lineHeight_Text(labelFont_()))));
         iLabelWidget *head = makeHeading_Widget(label);
         setAllCaps_LabelWidget(head, iTrue);
@@ -522,11 +523,12 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
         addChild_Widget(panel, iClob(head));
         widget = new_Widget();
         setBackgroundColor_Widget(widget, uiBackgroundSidebar_ColorId);
-        setPadding_Widget(widget, 4 * gap_UI, 2 * gap_UI, 4 * gap_UI, 2 * gap_UI);
+        const int hPad = (isHorizontal ? 0 : 1);
+        setPadding_Widget(widget, hPad * gap_UI, 2 * gap_UI, hPad * gap_UI, 2 * gap_UI);
         setFlags_Widget(widget,
                         borderTop_WidgetFlag |
                             borderBottom_WidgetFlag |
-                            arrangeHorizontal_WidgetFlag |
+                            (isHorizontal ? arrangeHorizontal_WidgetFlag : arrangeVertical_WidgetFlag) |
                             arrangeHeight_WidgetFlag |
                             resizeToParentWidth_WidgetFlag |
                             resizeWidthOfChildren_WidgetFlag,
@@ -534,7 +536,10 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
         setId_Widget(widget, id);
         for (const iMenuItem *radioItem = item->data; radioItem->label; radioItem++) {
             const char *  radId = cstr_Rangecc(range_Command(radioItem->label, "id"));
-            int64_t       flags = noBackground_WidgetFlag;
+            int64_t       flags = noBackground_WidgetFlag | frameless_WidgetFlag;
+            if (!isHorizontal) {
+                flags |= alignLeft_WidgetFlag;
+            }
             iLabelWidget *button;
             if (isRadio) {
                 const char *radLabel =
@@ -552,7 +557,7 @@ void makePanelItem_Mobile(iWidget *panel, const iMenuItem *item) {
                 updateSize_LabelWidget(button);
             }
             setId_Widget(as_Widget(button), radId);
-            setFont_LabelWidget(button, uiLabelMedium_FontId);
+            setFont_LabelWidget(button, isHorizontal ? uiLabelMedium_FontId : uiLabelBig_FontId);
             addChildFlags_Widget(widget, iClob(button), flags);
         }
     }
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 8440a597..674e2b7c 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -582,7 +582,9 @@ static void updateItemHeight_SidebarWidget_(iSidebarWidget *d) {
     if (d->list) {
         setItemHeight_ListWidget(d->list, heights[d->mode] * lineHeight_Text(d->itemFonts[0]));
     }
-    updateItemHeight_CertListWidget(d->certList);
+    if (d->certList) {
+        updateItemHeight_CertListWidget(d->certList);
+    }
 }
 
 iBool setMode_SidebarWidget(iSidebarWidget *d, enum iSidebarMode mode) {
diff --git a/src/ui/util.c b/src/ui/util.c
index 695e43aa..04483e8d 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -2380,7 +2380,7 @@ iWidget *makePreferences_Widget(void) {
             { "heading id:heading.prefs.pagecontent" },
             { "dropdown id:prefs.doctheme.dark", 0, 0, (const void *) docThemes[0] },
             { "dropdown id:prefs.doctheme.light", 0, 0, (const void *) docThemes[1] },
-            { "radio id:prefs.saturation", 0, 0, (const void *) satItems },
+            { "radio horizontal:1 id:prefs.saturation", 0, 0, (const void *) satItems },
             { "padding" },
             { "dropdown id:prefs.imagestyle", 0, 0, (const void *) imgStyles },
             { NULL }  
@@ -2397,12 +2397,12 @@ iWidget *makePreferences_Widget(void) {
             { "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" },
+            { "button text:" fontpack_Icon " " uiTextAction_ColorEscape "${menu.fonts}", 0, 0, "!open url:about:fonts" },
             { NULL }  
         };
         const iMenuItem stylePanelItems[] = {
             { "title id:heading.prefs.style" },
-            { "radio id:prefs.linewidth", 0, 0, (const void *) lineWidthItems },
+            { "radio horizontal:1 id:prefs.linewidth", 0, 0, (const void *) lineWidthItems },
             { "padding" },
             { "input id:prefs.linespacing maxlen:5" },
             { "radio id:prefs.quoteicon", 0, 0, (const void *) quoteItems },