Defined a set of UI icons; use in menus

5 files changed, 111 insertions, 77 deletions

diff --git a/src/defs.h b/src/defs.h
index 3280667e..b346b93c 100644
--- a/src/defs.h
+++ b/src/defs.h
@@ -31,5 +31,31 @@ enum iFileVersion {
 
 /* Icons */
 
-#define openLock_CStr   "\U0001f513"
-#define closedLock_CStr "\U0001f512"
+#define openLock_Icon       "\U0001f513"
+#define closedLock_Icon     "\U0001f512"
+#define close_Icon          "\u2a2f"
+#define reload_Icon         "\U0001f503"
+#define backArrow_Icon      "\U0001f870"
+#define forwardArrow_Icon   "\U0001f872"
+#define upArrow_Icon        "\u2191"
+#define upArrowBar_Icon     "\u2912"
+#define downArrowBar_Icon   "\u2913"
+#define barLeftArrow_Icon   "\u21a4"
+#define barRightArrow_Icon  "\u21a6"
+#define clock_Icon          "\U0001f553"
+#define pin_Icon            "\U0001f588"
+#define star_Icon           "\u2605"
+#define person_Icon         "\U0001f464"
+#define download_Icon       "\u2ba7"
+#define hourglass_Icon      "\u231b"
+#define timer_Icon          "\u23f2"
+#define home_Icon           "\U0001f3e0"
+#define edit_Icon           "\u270e"
+#define delete_Icon         "\u2bbf"
+#define copy_Icon           "\u2bba"
+#define check_Icon          "\u2714"
+#define ballotCheck_Icon    "\U0001f5f9"
+#define inbox_Icon          "\U0001f4e5"
+#define book_Icon           "\U0001f56e"
+#define open_Icon           "\u2bab"
+#define add_Icon            "\u2795"
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 6972f32d..3a317890 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -981,7 +981,7 @@ static void updateTrust_DocumentWidget_(iDocumentWidget *d, const iGmResponse *r
     iLabelWidget *lock = findWidget_App("navbar.lock");
     if (~d->certFlags & available_GmCertFlag) {
         setFlags_Widget(as_Widget(lock), disabled_WidgetFlag, iTrue);
-        updateTextCStr_LabelWidget(lock, gray50_ColorEscape openLock_CStr);
+        updateTextCStr_LabelWidget(lock, gray50_ColorEscape openLock_Icon);
         return;
     }
     setFlags_Widget(as_Widget(lock), disabled_WidgetFlag, iFalse);
@@ -990,7 +990,7 @@ static void updateTrust_DocumentWidget_(iDocumentWidget *d, const iGmResponse *r
         updateTextCStr_LabelWidget(lock, red_ColorEscape "\u26a0");
     }
     else if (d->certFlags & trusted_GmCertFlag) {
-        updateTextCStr_LabelWidget(lock, green_ColorEscape closedLock_CStr);
+        updateTextCStr_LabelWidget(lock, green_ColorEscape closedLock_Icon);
     }
     else {
         updateTextCStr_LabelWidget(lock, isDarkMode ? orange_ColorEscape "\u26a0"
@@ -2427,7 +2427,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                         pushBackN_Array(
                             &items,
                             (iMenuItem[]){
-                                { "Open Link in New Tab",
+                                { open_Icon " Open Link in New Tab",
                                   0,
                                   0,
                                   format_CStr("!open newtab:1 url:%s", cstr_String(linkUrl)) },
@@ -2461,7 +2461,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                     pushBackN_Array(&items,
                                     (iMenuItem[]){ { "---", 0, 0, NULL },
                                                    { "Copy Link", 0, 0, "document.copylink" },
-                                                   { "Bookmark Link...",
+                                                   { pin_Icon " Bookmark Link...",
                                                      0,
                                                      0,
                                                      format_CStr("!bookmark.add title:%s url:%s",
@@ -2472,7 +2472,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                     if (isNative && d->contextLink->mediaType != download_GmRunMediaType) {
                         pushBackN_Array(&items, (iMenuItem[]){
                             { "---", 0, 0, NULL },
-                            { "Download Linked File", 0, 0, "document.downloadlink" },
+                            { download_Icon " Download Linked File", 0, 0, "document.downloadlink" },
                         }, 2);
                     }
                     iMediaRequest *mediaReq;
@@ -2480,7 +2480,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                         d->contextLink->mediaType != download_GmRunMediaType) {
                         if (isFinished_GmRequest(mediaReq->req)) {
                             pushBack_Array(&items,
-                                           &(iMenuItem){ "Save to Downloads",
+                                           &(iMenuItem){ download_Icon " Save to Downloads",
                                                          0,
                                                          0,
                                                          format_CStr("document.media.save link:%u",
@@ -2500,16 +2500,16 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                         (iMenuItem[]){
                             { "Go Back", navigateBack_KeyShortcut, "navigate.back" },
                             { "Go Forward", navigateForward_KeyShortcut, "navigate.forward" },
-                            { "Go to Parent", navigateParent_KeyShortcut, "navigate.parent" },
-                            { "Go to Root", navigateRoot_KeyShortcut, "navigate.root" },
+                            { upArrow_Icon " Go to Parent", navigateParent_KeyShortcut, "navigate.parent" },
+                            { upArrowBar_Icon " Go to Root", navigateRoot_KeyShortcut, "navigate.root" },
                             { "---", 0, 0, NULL },
-                            { "Reload Page", reload_KeyShortcut, "navigate.reload" },
-                            { "Set Auto-Reload...", 0, 0, "document.autoreload.menu" },
+                            { reload_Icon " Reload Page", reload_KeyShortcut, "navigate.reload" },
+                            { timer_Icon " Set Auto-Reload...", 0, 0, "document.autoreload.menu" },
                             { "---", 0, 0, NULL },
-                            { "Bookmark Page...", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
-                            { "Subscribe to Page...", subscribeToPage_KeyModifier, "feeds.subscribe" },
+                            { pin_Icon " Bookmark Page...", SDLK_d, KMOD_PRIMARY, "bookmark.add" },
+                            { star_Icon " Subscribe to Page...", subscribeToPage_KeyModifier, "feeds.subscribe" },
                             { "---", 0, 0, NULL },
-                            { "Import Links as Bookmarks...", 0, 0, "bookmark.links confirm:1" },
+                            { book_Icon " Import Links as Bookmarks...", 0, 0, "bookmark.links confirm:1" },
                             { "---", 0, 0, NULL },
                             { "Copy Page URL", 0, 0, "document.copylink" } },
                         13);
@@ -2518,7 +2518,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
                             &items,
                             (iMenuItem[]){
                                 { "Copy Page Source", 'c', KMOD_PRIMARY, "copy" },
-                                { "Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" } },
+                                { download_Icon " Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" } },
                             2);
                     }
                 }
@@ -2943,7 +2943,7 @@ static void drawRun_DrawContext_(void *context, const iGmRun *run) {
             }
             if (findMediaRequest_DocumentWidget_(d->widget, run->linkId)) {
                 appendFormat_String(
-                    &text, "  %s\u2a2f", isHover ? escape_Color(tmLinkText_ColorId) : "");
+                    &text, "  %s" close_Icon, isHover ? escape_Color(tmLinkText_ColorId) : "");
             }
             const iInt2 size = measureRange_Text(metaFont, range_String(&text));
             fillRect_Paint(
diff --git a/src/ui/labelwidget.c b/src/ui/labelwidget.c
index 83deafe2..3ebec790 100644
--- a/src/ui/labelwidget.c
+++ b/src/ui/labelwidget.c
@@ -247,9 +247,11 @@ static void draw_LabelWidget_(const iLabelWidget *d) {
                           (iRect){ addX_I2(add_I2(bounds.pos, padding_(flags)), -2 * gap_UI),
                                    init_I2(iconPad, lineHeight_Text(d->font)) },
                           iTrue,
-                          flags & pressed_WidgetFlag ? fg
-                          : isHover                  ? uiIconHover_ColorId
-                                                     : uiIcon_ColorId,
+                          startsWith_String(&d->label, uiTextCaution_ColorEscape)
+                              ? uiTextCaution_ColorId
+                          : flags & (disabled_WidgetFlag | pressed_WidgetFlag) ? fg
+                          : isHover                                            ? uiIconHover_ColorId
+                                                                               : uiIcon_ColorId,
                           "%s",
                           cstr_String(&str));
         deinit_String(&str);
@@ -410,16 +412,17 @@ void setIcon_LabelWidget(iLabelWidget *d, iChar icon) {
 }
 
 iBool checkIcon_LabelWidget(iLabelWidget *d) {
-    if (!d->icon) {
-        iStringConstIterator iter;
-        init_StringConstIterator(&iter, &d->label);
-        const iChar icon = iter.value;
-        next_StringConstIterator(&iter);
-        if (iter.value == ' ' && icon >= 0x100) {
-            d->icon = icon;
-            remove_Block(&d->label.chars, 0, iter.next - constBegin_String(&d->label));
-            return iTrue;
-        }
+    iStringConstIterator iter;
+    init_StringConstIterator(&iter, &d->label);
+    const iChar icon = iter.value;
+    next_StringConstIterator(&iter);
+    if (iter.value == ' ' && icon >= 0x100) {
+        d->icon = icon;
+        remove_Block(&d->label.chars, 0, iter.next - constBegin_String(&d->label));
+        return iTrue;
+    }
+    else {
+        d->icon = 0;
     }
     return iFalse;
 }
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 1f5a6d01..abeeb2b9 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -23,6 +23,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "sidebarwidget.h"
 
 #include "app.h"
+#include "defs.h"
 #include "bookmarks.h"
 #include "command.h"
 #include "documentwidget.h"
@@ -196,16 +197,16 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
             }
             d->menu = makeMenu_Widget(
                 as_Widget(d),
-                (iMenuItem[]){ { "Open Entry in New Tab", 0, 0, "feed.entry.opentab" },
+                (iMenuItem[]){ { open_Icon " Open Entry in New Tab", 0, 0, "feed.entry.opentab" },
                                { "Mark as Read", 0, 0, "feed.entry.toggleread" },
-                               { "Add Bookmark...", 0, 0, "feed.entry.bookmark" },
+                               { pin_Icon " Add Bookmark...", 0, 0, "feed.entry.bookmark" },
                                { "---", 0, 0, NULL },
                                { "Open Feed Page", 0, 0, "feed.entry.openfeed" },
-                               { "Edit Feed...", 0, 0, "feed.entry.edit" },
-                               { uiTextCaution_ColorEscape "Unsubscribe...", 0, 0, "feed.entry.unsubscribe" },
+                               { edit_Icon " Edit Feed...", 0, 0, "feed.entry.edit" },
+                               { star_Icon " " uiTextCaution_ColorEscape "Unsubscribe...", 0, 0, "feed.entry.unsubscribe" },
                                { "---", 0, 0, NULL },
-                               { "Mark All as Read", SDLK_a, KMOD_SHIFT, "feeds.markallread" },
-                               { "Refresh Feeds", SDLK_r, KMOD_PRIMARY | KMOD_SHIFT, "feeds.refresh" } },
+                               { check_Icon " Mark All as Read", SDLK_a, KMOD_SHIFT, "feeds.markallread" },
+                               { reload_Icon " Refresh Feeds", SDLK_r, KMOD_PRIMARY | KMOD_SHIFT, "feeds.refresh" } },
                 10);
             break;
         }
@@ -255,20 +256,20 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
             }
             d->menu = makeMenu_Widget(
                 as_Widget(d),
-                (iMenuItem[]){ { "Open in New Tab", 0, 0, "bookmark.open newtab:1" },
+                (iMenuItem[]){ { open_Icon " Open in New Tab", 0, 0, "bookmark.open newtab:1" },
                                { "Open in Background Tab", 0, 0, "bookmark.open newtab:2" },
                                { "---", 0, 0, NULL },
-                               { "Edit...", 0, 0, "bookmark.edit" },
-                               { "Duplicate...", 0, 0, "bookmark.dup" },
+                               { edit_Icon " Edit...", 0, 0, "bookmark.edit" },
+                               { copy_Icon " Duplicate...", 0, 0, "bookmark.dup" },
                                { "Copy URL", 0, 0, "bookmark.copy" },
                                { "---", 0, 0, NULL },
                                { "?", 0, 0, "bookmark.tag tag:subscribed" },
                                { "?", 0, 0, "bookmark.tag tag:homepage" },
                                { "?", 0, 0, "bookmark.tag tag:remotesource" },
                                { "---", 0, 0, NULL },
-                               { uiTextCaution_ColorEscape "Delete Bookmark", 0, 0, "bookmark.delete" },
+                               { delete_Icon " " uiTextCaution_ColorEscape "Delete Bookmark", 0, 0, "bookmark.delete" },
                                { "---", 0, 0, NULL },
-                               { "Refresh Remote Sources", 0, 0, "bookmarks.reload.remote" } },
+                               { reload_Icon " Refresh Remote Sources", 0, 0, "bookmarks.reload.remote" } },
                14);
             break;
         }
@@ -316,11 +317,11 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                 as_Widget(d),
                 (iMenuItem[]){
                     { "Copy URL", 0, 0, "history.copy" },
-                    { "Add Bookmark...", 0, 0, "history.addbookmark" },
+                    { pin_Icon " Add Bookmark...", 0, 0, "history.addbookmark" },
                     { "---", 0, 0, NULL },
                     { "Forget URL", 0, 0, "history.delete" },
                     { "---", 0, 0, NULL },
-                    { uiTextCaution_ColorEscape "Clear History...", 0, 0, "history.clear confirm:1" },
+                    { delete_Icon " " uiTextCaution_ColorEscape "Clear History...", 0, 0, "history.clear confirm:1" },
                 }, 6);
             break;
         }
@@ -361,17 +362,17 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                 iRelease(item);
             }
             const iMenuItem menuItems[] = {
-                { "Use on This Page", 0, 0, "ident.use arg:1" },
-                { "Stop Using on This Page", 0, 0, "ident.use arg:0" },
-                { "Stop Using Everywhere", 0, 0, "ident.use arg:0 clear:1" },
+                { person_Icon " Use on This Page", 0, 0, "ident.use arg:1" },
+                { close_Icon " Stop Using on This Page", 0, 0, "ident.use arg:0" },
+                { close_Icon " Stop Using Everywhere", 0, 0, "ident.use arg:0 clear:1" },
                 { "Show Usage", 0, 0, "ident.showuse" },
                 { "---", 0, 0, NULL },
-                { "Edit Notes...", 0, 0, "ident.edit" },
+                { edit_Icon " Edit Notes...", 0, 0, "ident.edit" },
                 { "Copy Fingerprint", 0, 0, "ident.fingerprint" },
 //                { "Pick Icon...", 0, 0, "ident.pickicon" },
                 { "---", 0, 0, NULL },
                 //{ "Reveal Files", 0, 0, "ident.reveal" },
-                { uiTextCaution_ColorEscape "Delete Identity...", 0, 0, "ident.delete confirm:1" },
+                { delete_Icon " " uiTextCaution_ColorEscape "Delete Identity...", 0, 0, "ident.delete confirm:1" },
             };
             d->menu = makeMenu_Widget(as_Widget(d), menuItems, iElemCount(menuItems));
             break;
@@ -449,18 +450,18 @@ int width_SidebarWidget(const iSidebarWidget *d) {
 }
 
 static const char *normalModeLabels_[max_SidebarMode] = {
-    "\U0001f588 Bookmarks",
-    "\U00002605 Feeds",
-    "\U0001f553 History",
-    "\U0001f464 Identities",
+    pin_Icon " Bookmarks",
+    star_Icon " Feeds",
+    clock_Icon " History",
+    person_Icon " Identities",
     "\U0001f5b9 Outline",
 };
 
 static const char *tightModeLabels_[max_SidebarMode] = {
-    "\U0001f588",
-    "\U00002605",
-    "\U0001f553",
-    "\U0001f464",
+    pin_Icon,
+    star_Icon,
+    clock_Icon,
+    person_Icon,
     "\U0001f5b9",
 };
 
@@ -1162,22 +1163,25 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                         if (menuItem) {
                             setTextCStr_LabelWidget(menuItem,
                                                     hasTag_Bookmark(bm, "homepage")
-                                                        ? "Remove Homepage"
-                                                        : "Use as Homepage");
+                                                        ? home_Icon " Remove Homepage"
+                                                        : home_Icon " Use as Homepage");
+                            checkIcon_LabelWidget(menuItem);
                         }
                         menuItem = findMenuItem_Widget(d->menu, "bookmark.tag tag:subscribed");
                         if (menuItem) {
                             setTextCStr_LabelWidget(menuItem,
                                                     hasTag_Bookmark(bm, "subscribed")
-                                                        ? "Unsubscribe from Feed"
-                                                        : "Subscribe to Feed");
+                                                        ? star_Icon " Unsubscribe from Feed"
+                                                        : star_Icon " Subscribe to Feed");
+                            checkIcon_LabelWidget(menuItem);
                         }
                         menuItem = findMenuItem_Widget(d->menu, "bookmark.tag tag:remotesource");
                         if (menuItem) {
                             setTextCStr_LabelWidget(menuItem,
                                                     hasTag_Bookmark(bm, "remotesource")
-                                                        ? "Remove Bookmark Source"
-                                                        : "Use as Bookmark Source");
+                                                        ? downArrowBar_Icon " Remove Bookmark Source"
+                                                        : downArrowBar_Icon " Use as Bookmark Source");
+                            checkIcon_LabelWidget(menuItem);
                         }
                     }
                 }
diff --git a/src/ui/window.c b/src/ui/window.c
index 008290b9..bf7214f4 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -22,6 +22,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #include "window.h"
 
+#include "defs.h"
 #include "labelwidget.h"
 #include "inputwidget.h"
 #include "documentwidget.h"
@@ -162,7 +163,7 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
 #if !defined (iPlatformAppleMobile)
 /* TODO: Submenus wouldn't hurt here. */
 static const iMenuItem navMenuItems_[] = {
-    { "New Tab", 't', KMOD_PRIMARY, "tabs.new" },
+    { add_Icon " New Tab", 't', KMOD_PRIMARY, "tabs.new" },
     { "Open Location...", SDLK_l, KMOD_PRIMARY, "navigate.focus" },
     { "---", 0, 0, NULL },
     { "Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" },
@@ -314,14 +315,14 @@ static const iMenuItem identityButtonMenuItems_[] = {
     { "---", 0, 0, NULL },
     { "Show Identities", '4', KMOD_PRIMARY, "sidebar.mode arg:3 show:1" },
 #   else
-    { "New Identity...", 0, 0, "ident.new" },
+    { add_Icon " New Identity...", 0, 0, "ident.new" },
     { "---", 0, 0, NULL },
-    { "Show Identities", 0, 0, "sidebar.mode arg:3 show:1" },
+    { person_Icon " Show Identities", 0, 0, "sidebar.mode arg:3 show:1" },
 #endif
 };
 #endif
 
-static const char *reloadCStr_ = "\U0001f503";
+static const char *reloadCStr_ = reload_Icon;
 
 /* TODO: A preference for these, maybe? */
 static const char *stopSeqCStr_[] = {
@@ -894,7 +895,7 @@ static void setupUserInterface_Window(iWindow *d) {
             frameless_WidgetFlag);
         setId_Widget(as_Widget(appMax), "winbar.max");
         addChildFlags_Widget(winBar,
-                             iClob(appClose = newLargeIcon_LabelWidget("\u2a2f", "window.close")),
+                             iClob(appClose = newLargeIcon_LabelWidget(close_Icon, "window.close")),
                              frameless_WidgetFlag);
         setId_Widget(as_Widget(appClose), "winbar.close");
         setFont_LabelWidget(appClose, uiContent_FontId);
@@ -916,8 +917,8 @@ static void setupUserInterface_Window(iWindow *d) {
         addChild_Widget(div, iClob(navBar));
         setBackgroundColor_Widget(navBar, uiBackground_ColorId);
         setCommandHandler_Widget(navBar, handleNavBarCommands_);
-        setId_Widget(addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f870", 0, 0, "navigate.back")), collapse_WidgetFlag), "navbar.back");
-        setId_Widget(addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget("\U0001f872", 0, 0, "navigate.forward")), collapse_WidgetFlag), "navbar.forward");
+        setId_Widget(addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget(backArrow_Icon, 0, 0, "navigate.back")), collapse_WidgetFlag), "navbar.back");
+        setId_Widget(addChildFlags_Widget(navBar, iClob(newIcon_LabelWidget(forwardArrow_Icon, 0, 0, "navigate.forward")), collapse_WidgetFlag), "navbar.forward");
         addChildFlags_Widget(navBar, iClob(new_Widget()), expand_WidgetFlag);
         iLabelWidget *idMenu = makeMenuButton_LabelWidget(
             "\U0001f464", identityButtonMenuItems_, iElemCount(identityButtonMenuItems_));
@@ -984,7 +985,7 @@ static void setupUserInterface_Window(iWindow *d) {
         addChildFlags_Widget(navBar, iClob(new_Widget()), expand_WidgetFlag);
         setId_Widget(addChildFlags_Widget(navBar,
                         iClob(newIcon_LabelWidget(
-                            "\U0001f3e0", SDLK_h, KMOD_PRIMARY | KMOD_SHIFT, "navigate.home")),
+                            home_Icon, SDLK_h, KMOD_PRIMARY | KMOD_SHIFT, "navigate.home")),
                         collapse_WidgetFlag),
                      "navbar.home");
 #if !defined (iHaveNativeMenus)
@@ -1023,7 +1024,7 @@ static void setupUserInterface_Window(iWindow *d) {
             setBackgroundColor_Widget(buttons, uiBackground_ColorId);
         }
         setId_Widget(
-            addChild_Widget(buttons, iClob(newIcon_LabelWidget("\u2795", 0, 0, "tabs.new"))),
+            addChild_Widget(buttons, iClob(newIcon_LabelWidget(add_Icon, 0, 0, "tabs.new"))),
             "newtab");
     }
     /* Side bars. */ {
@@ -1064,7 +1065,7 @@ static void setupUserInterface_Window(iWindow *d) {
                      "find.input");
         addChild_Widget(searchBar, iClob(newIcon_LabelWidget("  \u2b9f  ", 'g', KMOD_PRIMARY, "find.next")));
         addChild_Widget(searchBar, iClob(newIcon_LabelWidget("  \u2b9d  ", 'g', KMOD_PRIMARY | KMOD_SHIFT, "find.prev")));
-        addChild_Widget(searchBar, iClob(newIcon_LabelWidget("\u2a2f", SDLK_ESCAPE, 0, "find.close")));
+        addChild_Widget(searchBar, iClob(newIcon_LabelWidget(close_Icon, SDLK_ESCAPE, 0, "find.close")));
     }
 #if defined (iPlatformAppleMobile)
     /* Bottom toolbar. */
@@ -1094,7 +1095,7 @@ static void setupUserInterface_Window(iWindow *d) {
         const iMenuItem items[] = {
             { "\U0001f588 Bookmarks", 0, 0, "toolbar.showview arg:0" },
             { "\U00002605 Feeds", 0, 0, "toolbar.showview arg:1" },
-            { "\U0001f553 History", 0, 0, "toolbar.showview arg:2" },
+            { clock_Icon " History", 0, 0, "toolbar.showview arg:2" },
             { "\U0001f5b9 Page Outline", 0, 0, "toolbar.showview arg:4" },
         };
         iWidget *menu = makeMenu_Widget(findChild_Widget(toolBar, "toolbar.view"),
@@ -1105,12 +1106,12 @@ static void setupUserInterface_Window(iWindow *d) {
     updatePadding_Window_(d);
     iWidget *tabsMenu = makeMenu_Widget(d->root,
                                         (iMenuItem[]){
-                                            { "Close Tab", 0, 0, "tabs.close" },
-                                            { "Duplicate Tab", 0, 0, "tabs.new duplicate:1" },
+                                            { close_Icon " Close Tab", 0, 0, "tabs.close" },
+                                            { copy_Icon " Duplicate Tab", 0, 0, "tabs.new duplicate:1" },
                                             { "---", 0, 0, NULL },
                                             { "Close Other Tabs", 0, 0, "tabs.close toleft:1 toright:1" },
-                                            { "Close Tabs To Left", 0, 0, "tabs.close toleft:1" },
-                                            { "Close Tabs To Right", 0, 0, "tabs.close toright:1" },
+                                            { barLeftArrow_Icon " Close Tabs To Left", 0, 0, "tabs.close toleft:1" },
+                                            { barRightArrow_Icon " Close Tabs To Right", 0, 0, "tabs.close toright:1" },
                                         },
                                         6);
     setId_Widget(tabsMenu, "doctabs.menu");