13 files changed, 109 insertions, 27 deletions

diff --git a/src/bookmarks.c b/src/bookmarks.c
index e54c6239..7cf7f5a1 100644
--- a/src/bookmarks.c
+++ b/src/bookmarks.c
@@ -216,6 +216,23 @@ iBool remove_Bookmarks(iBookmarks *d, uint32_t id) {
     return bm != NULL;
 }
 
+iBool updateBookmarkIcon_Bookmarks(iBookmarks *d, const iString *url, iChar icon) {
+    iBool changed = iFalse;
+    lock_Mutex(d->mtx);
+    const uint32_t id = findUrl_Bookmarks(d, url);
+    if (id) {
+        iBookmark *bm = get_Bookmarks(d, id);
+        if (!hasTag_Bookmark(bm, "remote")) {
+            if (icon != bm->icon) {
+                bm->icon = icon;
+                changed = iTrue;
+            }
+        }
+    }
+    unlock_Mutex(d->mtx);
+    return changed;
+}
+
 iBookmark *get_Bookmarks(iBookmarks *d, uint32_t id) {
     return (iBookmark *) value_Hash(&d->bookmarks, id);
 }
diff --git a/src/bookmarks.h b/src/bookmarks.h
index 2975b082..26bd9a47 100644
--- a/src/bookmarks.h
+++ b/src/bookmarks.h
@@ -62,6 +62,7 @@ void        requestFinished_Bookmarks   (iBookmarks *, iGmRequest *req);
 void        add_Bookmarks       (iBookmarks *, const iString *url, const iString *title,
                                  const iString *tags, iChar icon);
 iBool       remove_Bookmarks    (iBookmarks *, uint32_t id);
+iBool       updateBookmarkIcon_Bookmarks    (iBookmarks *, const iString *url, iChar icon);
 iBookmark * get_Bookmarks       (iBookmarks *, uint32_t id);
 uint32_t    findUrl_Bookmarks   (const iBookmarks *, const iString *url); /* O(n) */
 
diff --git a/src/gmutil.c b/src/gmutil.c
index afca4978..cf96cfd8 100644
--- a/src/gmutil.c
+++ b/src/gmutil.c
@@ -315,7 +315,7 @@ void urlEncodeSpaces_String(iString *d) {
     }
 }
 
-const iString *feedEntryOpenCommand_String(const iString *url) {
+const iString *feedEntryOpenCommand_String(const iString *url, int newTab) {
     if (!isEmpty_String(url)) {
         iString *cmd = collectNew_String();
         const size_t fragPos = indexOf_String(url, '#');
@@ -323,14 +323,15 @@ const iString *feedEntryOpenCommand_String(const iString *url) {
             iString *head = newRange_String(
                 (iRangecc){ constBegin_String(url) + fragPos + 1, constEnd_String(url) });
             format_String(cmd,
-                          "open gotourlheading:%s url:%s",
+                          "open newtab:%d gotourlheading:%s url:%s",
+                          newTab,
                           cstr_String(head),
                           cstr_Rangecc((iRangecc){ constBegin_String(url),
                                                    constBegin_String(url) + fragPos }));
             delete_String(head);
         }
         else {
-            format_String(cmd, "open url:%s", cstr_String(url));
+            format_String(cmd, "open newtab:%d url:%s", newTab, cstr_String(url));
         }
         return cmd;
     }
diff --git a/src/gmutil.h b/src/gmutil.h
index 88ed1f32..a9c8c42a 100644
--- a/src/gmutil.h
+++ b/src/gmutil.h
@@ -110,4 +110,4 @@ iString *       makeFileUrl_String      (const iString *localFilePath);
 const char *    makeFileUrl_CStr        (const char *localFilePath);
 void            urlEncodeSpaces_String  (iString *);
 
-const iString * feedEntryOpenCommand_String (const iString *url); /* checks fragment */
+const iString * feedEntryOpenCommand_String (const iString *url, int newTab); /* checks fragment */
diff --git a/src/ui/color.c b/src/ui/color.c
index 7cbb468b..1bab8538 100644
--- a/src/ui/color.c
+++ b/src/ui/color.c
@@ -82,6 +82,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
             copy_(uiText_ColorId, gray75_ColorId);
             copy_(uiTextPressed_ColorId, black_ColorId);
             copy_(uiTextStrong_ColorId, white_ColorId);
+            copy_(uiTextDim_ColorId, gray75_ColorId);
             copy_(uiTextSelected_ColorId, white_ColorId);
             copy_(uiTextFramelessHover_ColorId, white_ColorId);
             copy_(uiTextDisabled_ColorId, gray25_ColorId);
@@ -126,6 +127,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
             copy_(uiText_ColorId, gray75_ColorId);
             copy_(uiTextPressed_ColorId, black_ColorId);
             copy_(uiTextStrong_ColorId, white_ColorId);
+            copy_(uiTextDim_ColorId, gray75_ColorId);
             copy_(uiTextSelected_ColorId, white_ColorId);
             copy_(uiTextDisabled_ColorId, gray50_ColorId);
             copy_(uiTextFramelessHover_ColorId, white_ColorId);
@@ -167,7 +169,8 @@ void setThemePalette_Color(enum iColorTheme theme) {
             copy_(uiBackgroundPressed_ColorId, cyan_ColorId);
             copy_(uiBackgroundFramelessHover_ColorId, orange_ColorId);
             copy_(uiText_ColorId, black_ColorId);
-            copy_(uiTextStrong_ColorId, teal_ColorId);
+            copy_(uiTextStrong_ColorId, black_ColorId);
+            copy_(uiTextDim_ColorId, gray25_ColorId);
             copy_(uiTextPressed_ColorId, black_ColorId);
             copy_(uiTextSelected_ColorId, black_ColorId);
             copy_(uiTextDisabled_ColorId, gray50_ColorId);
@@ -213,6 +216,7 @@ void setThemePalette_Color(enum iColorTheme theme) {
             copy_(uiTextPressed_ColorId, black_ColorId);
             copy_(uiTextDisabled_ColorId, gray75_ColorId);
             copy_(uiTextStrong_ColorId, black_ColorId);
+            copy_(uiTextDim_ColorId, gray25_ColorId);
             copy_(uiTextSelected_ColorId, black_ColorId);
             copy_(uiTextFramelessHover_ColorId, black_ColorId);
             copy_(uiTextShortcut_ColorId, brown_ColorId);
diff --git a/src/ui/color.h b/src/ui/color.h
index bc2f04f6..61da37c0 100644
--- a/src/ui/color.h
+++ b/src/ui/color.h
@@ -103,6 +103,7 @@ enum iColorId {
     uiMarked_ColorId,
     uiMatching_ColorId,
     uiBackgroundUnfocusedSelection_ColorId,
+    uiTextDim_ColorId,
 
     /* content theme colors */
     tmFirst_ColorId,
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index da66c65d..0a8197b5 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1181,6 +1181,7 @@ static void checkResponse_DocumentWidget_(iDocumentWidget *d) {
                     "document.input.submit");
                 setSensitiveContent_InputWidget(findChild_Widget(dlg, "input"),
                                                 statusCode == sensitiveInput_GmStatusCode);
+                updateTheme_DocumentWidget_(d);
                 break;
             }
             case categorySuccess_GmStatusCode:
diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
index b80170d2..284d518e 100644
--- a/src/ui/lookupwidget.c
+++ b/src/ui/lookupwidget.c
@@ -535,7 +535,7 @@ static void presentResults_LookupWidget_(iLookupWidget *d) {
                               cstr_String(&res->label),
                               uiText_ColorEscape,
                               cstr_String(&res->meta));
-                const iString *cmd = feedEntryOpenCommand_String(&res->url);
+                const iString *cmd = feedEntryOpenCommand_String(&res->url, 0);
                 if (cmd) {
                     set_String(&item->command, cmd);
                 }
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 6adf1d1b..317e74bd 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -524,7 +524,8 @@ static void itemClicked_SidebarWidget_(iSidebarWidget *d, const iSidebarItem *it
             break;
         }
         case feeds_SidebarMode: {
-            postCommandString_App(feedEntryOpenCommand_String(&item->url));
+            postCommandString_App(
+                feedEntryOpenCommand_String(&item->url, openTabMode_Sym(SDL_GetModState())));
             break;
         }
         case bookmarks_SidebarMode:
@@ -898,7 +899,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                                       uiHeading_ColorEscape "IDENTITY NOTES",
                                       format_CStr("Notes about %s:", cstr_String(name_GmIdentity(ident))),
                                       uiTextAction_ColorEscape "OK",
-                                      format_CStr("ident.setnotes ident:%p", ident));
+                                      format_CStr("!ident.setnotes ident:%p ptr:%p", ident, d));
             }
             return iTrue;
         }
@@ -1173,8 +1174,9 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
         }
         else {
             const iBool isUnread = (d->indent != 0);
+            const int titleFont = isUnread ? uiContentBold_FontId : uiContent_FontId;
             const int h1 = lineHeight_Text(uiLabel_FontId);
-            const int h2 = lineHeight_Text(uiContent_FontId);
+            const int h2 = lineHeight_Text(titleFont);
             const int iconPad = 9 * gap_UI;
             iRect iconArea = { addY_I2(pos, 0), init_I2(iconPad, itemHeight) };
             if (isUnread) {
@@ -1198,7 +1200,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                 deinit_String(&str);
             }
             /* Select the layout based on how the title fits. */
-            iInt2       titleSize = advanceRange_Text(uiContent_FontId, range_String(&d->label));
+            iInt2       titleSize = advanceRange_Text(titleFont, range_String(&d->label));
             const iInt2 metaSize  = advanceRange_Text(uiLabel_FontId, range_String(&d->meta));
             pos.x += iconPad;
             const int avail = width_Rect(itemRect) - iconPad - 3 * gap_UI;
@@ -1213,12 +1215,12 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                 const char *endPos;
                 tryAdvance_Text(
                     uiContent_FontId, range_String(&d->label), avail - skip, &endPos);
-                drawRange_Text(uiContent_FontId,
+                drawRange_Text(titleFont,
                                cur,
                                labelFg,
                                (iRangecc){ constBegin_String(&d->label), endPos });
                 if (endPos < constEnd_String(&d->label)) {
-                    drawRange_Text(uiContent_FontId,
+                    drawRange_Text(titleFont,
                                    addY_I2(pos, h2), labelFg,
                                    (iRangecc){ endPos, constEnd_String(&d->label) });
                 }
@@ -1226,7 +1228,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
             else {
                 pos.y += (itemHeight - h1 - h2) / 2;
                 drawRange_Text(uiLabel_FontId, pos, fg, range_String(&d->meta));
-                drawRange_Text(uiContent_FontId, addY_I2(pos, h1), labelFg, range_String(&d->label));
+                drawRange_Text(titleFont, addY_I2(pos, h1), labelFg, range_String(&d->label));
             }
         }
     }
@@ -1265,8 +1267,6 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
     }
     else if (sidebar->mode == history_SidebarMode) {
         iBeginCollect();
-        const int fg = isHover ? (isPressing ? uiTextPressed_ColorId : uiTextFramelessHover_ColorId)
-                               : uiText_ColorId;
         if (d->listItem.isSeparator) {
             if (!isEmpty_String(&d->meta)) {
                 iInt2 drawPos = addY_I2(topLeft_Rect(itemRect), d->id);
@@ -1283,6 +1283,8 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
             }
         }
         else {
+            const int fg = isHover ? (isPressing ? uiTextPressed_ColorId : uiTextFramelessHover_ColorId)
+                                   : uiTextDim_ColorId;
             iUrl parts;
             init_Url(&parts, &d->label);
             const iBool isAbout  = equalCase_Rangecc(parts.scheme, "about");
@@ -1315,11 +1317,14 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
                             2));
         const int metaFg = isHover ? permanent_ColorId | (isPressing ? uiTextPressed_ColorId
                                                                      : uiTextFramelessHover_ColorId)
-                                   : uiText_ColorId;
+                                   : uiTextDim_ColorId;
         drawRange_Text(
             font, cPos, d->listItem.isSelected ? iconColor : metaFg, range_String(&icon));
         deinit_String(&icon);
-        drawRange_Text(font, add_I2(cPos, init_I2(6 * gap_UI, 0)), fg, range_String(&d->label));
+        drawRange_Text(d->listItem.isSelected ? uiContentBold_FontId : font,
+                       add_I2(cPos, init_I2(6 * gap_UI, 0)),
+                       fg,
+                       range_String(&d->label));
         drawRange_Text(default_FontId,
                        add_I2(cPos, init_I2(6 * gap_UI, lineHeight_Text(font))),
                        metaFg,
diff --git a/src/ui/text.c b/src/ui/text.c
index 2ab40387..2b3e187d 100644
--- a/src/ui/text.c
+++ b/src/ui/text.c
@@ -130,10 +130,15 @@ static void init_Font(iFont *d, const iBlock *data, int height, float scale,
     memset(d->indexTable, 0xff, sizeof(d->indexTable));
 }
 
-static void deinit_Font(iFont *d) {
+static void clearGlyphs_Font_(iFont *d) {
     iForEach(Hash, i, &d->glyphs) {
         delete_Glyph((iGlyph *) i.value);
     }
+    clear_Hash(&d->glyphs);
+}
+
+static void deinit_Font(iFont *d) {
+    clearGlyphs_Font_(d);
     deinit_Hash(&d->glyphs);
     delete_Block(d->data);
 }
@@ -149,6 +154,8 @@ static uint32_t glyphIndex_Font_(iFont *d, iChar ch) {
     return stbtt_FindGlyphIndex(&d->font, ch);
 }
 
+/*----------------------------------------------------------------------------------------------*/
+
 iDeclareType(Text)
 iDeclareType(CacheRow)
 
@@ -224,7 +231,9 @@ static void initFonts_Text_(iText *d) {
         int symbolsFont;
     } fontData[max_FontId] = {
         { &fontSourceSansProRegular_Embedded, fontSize_UI,          1.0f, defaultSymbols_FontId },
+        { &fontSourceSansProBold_Embedded,    fontSize_UI,          1.0f, defaultSymbols_FontId },
         { &fontSourceSansProRegular_Embedded, fontSize_UI * 1.125f, 1.0f, defaultMediumSymbols_FontId },
+        { &fontSourceSansProBold_Embedded,    fontSize_UI * 1.125f, 1.0f, defaultMediumSymbols_FontId },
         { &fontSourceSansProRegular_Embedded, fontSize_UI * 1.666f, 1.0f, defaultLargeSymbols_FontId },
         { &fontIosevkaTermExtended_Embedded,  fontSize_UI * 0.866f, 1.0f, defaultSymbols_FontId },
         { &fontSourceSansProRegular_Embedded, textSize,             scaling, symbols_FontId },
@@ -330,11 +339,15 @@ static void deinitFonts_Text_(iText *d) {
     }
 }
 
+static int maxGlyphHeight_Text_(const iText *d) {
+    return 2 * d->contentFontSize * fontSize_UI;
+}
+
 static void initCache_Text_(iText *d) {
     init_Array(&d->cacheRows, sizeof(iCacheRow));
     const int textSize = d->contentFontSize * fontSize_UI;
     iAssert(textSize > 0);
-    const iInt2 cacheDims = init_I2(16, 80);
+    const iInt2 cacheDims = init_I2(16, 40);
     d->cacheSize = mul_I2(cacheDims, init1_I2(iMax(textSize, fontSize_UI)));
     SDL_RendererInfo renderInfo;
     SDL_GetRendererInfo(d->render, &renderInfo);
@@ -417,6 +430,14 @@ void setContentFontSize_Text(float fontSizeFactor) {
     }
 }
 
+static void resetCache_Text_(iText *d) {
+    deinitCache_Text_(d);
+    for (int i = 0; i < max_FontId; i++) {
+        clearGlyphs_Font_(&d->fonts[i]);
+    }
+    initCache_Text_(d);
+}
+
 void resetFonts_Text(void) {
     iText *d = &text_;
     deinitFonts_Text_(d);
@@ -572,6 +593,13 @@ static const iGlyph *glyph_Font_(iFont *d, iChar ch) {
     iGlyph *glyph     = new_Glyph(ch);
     glyph->glyphIndex = glyphIndex;
     glyph->font       = font;
+    /* If the cache is running out of space, clear it and we'll recache what's needed currently. */
+    if (text_.cacheBottom > text_.cacheSize.y - maxGlyphHeight_Text_(&text_)) {
+#if !defined (NDEBUG)
+        printf("[Text] glyph cache is full, clearing!\n"); fflush(stdout);
+#endif
+        resetCache_Text_(&text_);
+    }
     SDL_Texture *oldTarget = SDL_GetRenderTarget(text_.render);
     SDL_SetRenderTarget(text_.render, text_.cache);
     cache_Font_(font, glyph, 0);
diff --git a/src/ui/text.h b/src/ui/text.h
index f78f570a..217bdd13 100644
--- a/src/ui/text.h
+++ b/src/ui/text.h
@@ -31,10 +31,12 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 enum iFontId {
     default_FontId,
+    defaultBold_FontId,
     defaultMedium_FontId,
+    defaultMediumBold_FontId,
     defaultLarge_FontId,
     defaultMonospace_FontId,
-    defaultContentSized_FontId,
+    defaultContentSized_FontId,    
     /* content fonts */
     regular_FontId,
     monospace_FontId,
@@ -96,10 +98,12 @@ enum iFontId {
 
     /* UI fonts: */
     uiLabel_FontId          = default_FontId,
+    uiLabelBold_FontId      = defaultBold_FontId,
     uiLabelLarge_FontId     = defaultLarge_FontId,
     uiShortcuts_FontId      = default_FontId,
     uiInput_FontId          = defaultMonospace_FontId,
     uiContent_FontId        = defaultMedium_FontId,
+    uiContentBold_FontId    = defaultMediumBold_FontId,
     uiContentSymbols_FontId = defaultMediumSymbols_FontId,
     /* Document fonts: */
     paragraph_FontId         = regular_FontId,
diff --git a/src/ui/util.c b/src/ui/util.c
index 0361cd72..c626759a 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -872,12 +872,13 @@ iWidget *makeValueInput_Widget(iWidget *parent, const iString *initialValue, con
     iWidget *div = new_Widget(); {
         setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
         addChild_Widget(div, iClob(newKeyMods_LabelWidget("Cancel", SDLK_ESCAPE, 0, "cancel")));
-        addChild_Widget(
+        iLabelWidget *accept = addChild_Widget(
             div,
             iClob(newKeyMods_LabelWidget(acceptLabel ? acceptLabel : uiTextAction_ColorEscape "OK",
                                          SDLK_RETURN,
                                          0,
                                          "valueinput.accept")));
+        setFont_LabelWidget(accept, uiLabelBold_FontId);
     }
     addChild_Widget(dlg, iClob(div));
     centerSheet_Widget(dlg);
@@ -924,8 +925,12 @@ iWidget *makeQuestion_Widget(const char *title, const char *msg, const char *lab
         setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
         for (size_t i = 0; i < count; ++i) {
             /* The last one is the default option. */
-            const int key = (i == count - 1 ? SDLK_RETURN : 0);
-            addChild_Widget(div, iClob(newKeyMods_LabelWidget(labels[i], key, 0, commands[i])));
+            const int     key = (i == count - 1 ? SDLK_RETURN : 0);
+            iLabelWidget *btn =
+                addChild_Widget(div, iClob(newKeyMods_LabelWidget(labels[i], key, 0, commands[i])));
+            if (key) {
+                setFont_LabelWidget(btn, uiLabelBold_FontId);
+            }
         }
     }
     addChild_Widget(dlg, iClob(div));
@@ -1168,7 +1173,10 @@ iWidget *makePreferences_Widget(void) {
     }
     iWidget *div = new_Widget(); {
         setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
-        addChild_Widget(div, iClob(newKeyMods_LabelWidget("Dismiss", SDLK_ESCAPE, 0, "prefs.dismiss")));
+        setFont_LabelWidget(
+            addChild_Widget(
+                div, iClob(newKeyMods_LabelWidget("Dismiss", SDLK_ESCAPE, 0, "prefs.dismiss"))),
+            uiLabelBold_FontId);
     }
     addChild_Widget(dlg, iClob(div));
     addChild_Widget(get_Window()->root, iClob(dlg));
@@ -1205,10 +1213,11 @@ iWidget *makeBookmarkEditor_Widget(void) {
     iWidget *div = new_Widget(); {
         setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
         addChild_Widget(div, iClob(newKeyMods_LabelWidget("Cancel", SDLK_ESCAPE, 0, "cancel")));
-        addChild_Widget(
+        iLabelWidget *accept = addChild_Widget(
             div,
             iClob(newKeyMods_LabelWidget(
                 uiTextCaution_ColorEscape "Save Bookmark", SDLK_RETURN, KMOD_PRIMARY, "bmed.accept")));
+        setFont_LabelWidget(accept, uiLabelBold_FontId);
     }
     addChild_Widget(dlg, iClob(div));
     addChild_Widget(get_Window()->root, iClob(dlg));
@@ -1345,6 +1354,7 @@ iWidget *makeFeedSettings_Widget(uint32_t bookmarkId) {
                                          KMOD_PRIMARY,
                                          format_CStr("feedcfg.accept bmid:%d", bookmarkId)))),
                      "feedcfg.save");
+        setFont_LabelWidget(findChild_Widget(div, "feedcfg.save"), uiLabelBold_FontId);
     }
     addChild_Widget(dlg, iClob(div));
     arrange_Widget(dlg);
@@ -1421,10 +1431,11 @@ iWidget *makeIdentityCreation_Widget(void) {
     iWidget *div = new_Widget(); {
         setFlags_Widget(div, arrangeHorizontal_WidgetFlag | arrangeSize_WidgetFlag, iTrue);
         addChild_Widget(div, iClob(newKeyMods_LabelWidget("Cancel", SDLK_ESCAPE, 0, "cancel")));
-        addChild_Widget(
+        iLabelWidget *accept = addChild_Widget(
             div,
             iClob(newKeyMods_LabelWidget(
                 uiTextAction_ColorEscape "Create Identity", SDLK_RETURN, KMOD_PRIMARY, "ident.accept")));
+        setFont_LabelWidget(accept, uiLabelBold_FontId);
     }
     addChild_Widget(dlg, iClob(div));
     addChild_Widget(get_Window()->root, iClob(dlg));
diff --git a/src/ui/window.c b/src/ui/window.c
index e1bb1c0b..c13d5843 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -27,6 +27,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "documentwidget.h"
 #include "sidebarwidget.h"
 #include "lookupwidget.h"
+#include "bookmarks.h"
 #include "embedded.h"
 #include "command.h"
 #include "paint.h"
@@ -396,6 +397,14 @@ static iBool handleNavBarCommands_(iWidget *navBar, const char *cmd) {
                 setText_InputWidget(url, urlStr);
                 checkLoadAnimation_Window_(get_Window());
                 updateNavBarIdentity_(navBar);
+                /* Icon updates should be limited to automatically chosen icons if the user
+                   is allowed to pick their own in the future. */
+                if (updateBookmarkIcon_Bookmarks(
+                    bookmarks_App(),
+                    urlStr,
+                        siteIcon_GmDocument(document_DocumentWidget(document_App())))) {
+                    postCommand_App("bookmarks.changed");
+                }
                 return iFalse;
             }
             else if (equal_Command(cmd, "document.request.cancelled")) {
@@ -960,7 +969,7 @@ void draw_Window(iWindow *d) {
 #if 0
     /* Text cache debugging. */ {
         SDL_Texture *cache = glyphCache_Text();
-        SDL_Rect rect = { d->root->rect.size.x - 640, 0, 640, 5 * 640 };
+        SDL_Rect rect = { d->root->rect.size.x - 640, 0, 640, 2.5 * 640 };
         SDL_SetRenderDrawColor(d->render, 0, 0, 0, 255);
         SDL_RenderFillRect(d->render, &rect);
         SDL_RenderCopy(d->render, glyphCache_Text(), NULL, &rect);