diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 8077980d..9d68b68e 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -10487,6 +10487,14 @@
   /** Icons - List **************************************************************/
   :root {
     --uc-folder-icon: url("chrome://global/skin/icons/folder.svg");
+    --uc-tab-icon: url("../icons/tab.svg");
+    --uc-tab-copy-icon: url("../icons/tab-copy.svg");
+    --uc-tab-unload-icon: url("../icons/tab-unload.svg");
+    --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg");
+    --uc-new-tab-icon: url("../icons/new-tab.svg");
+    --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg");
+    --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple.svg");
+    --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward.svg");
     --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg");
     --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.svg");
   }
@@ -10495,12 +10503,28 @@
       --uc-folder-icon: url("../icons/folder.svg");
     }
   }
+  @supports -moz-bool-pref("userChrome.tab.connect_to_window") {
+    :root {
+      --uc-tab-icon: url("../icons/tab-photon.svg");
+      --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg");
+      --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg");
+      --uc-tab-multiple-icon: url("../icons/tab-multiple.svg");
+      --uc-new-tab-icon: url("../icons/new-tab-photon.svg");
+      --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg");
+      --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple-photon.svg");
+      --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward-photon.svg");
+    }
+  }
   @supports selector(:has(a)) {
     :root:has(#sidebar-box[positionend="true"]) {
       --uc-sidebar-icon: url("chrome://browser/skin/sidebars-right.svg");
       --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars.svg");
     }
   }
+  .urlbarView-row[source="tabs"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon,
+  #urlbar-engine-one-off-item-tabs {
+    list-style-image: var(--uc-tab-icon) !important;
+  }
   /** Library - Icons Replace ***************************************************/
   @supports -moz-bool-pref("userChrome.icon.library") {
     /*= Standard Folder - More Visible ===========================================*/
@@ -10562,8 +10586,9 @@
     }
     /* Tag */
     :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer),
-    :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) {
-      list-style-image: url("chrome://browser/skin/places/tag.svg") !important;
+    :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v),
+    .bookmark-item[query][tagContainer] {
+      list-style-image: url("../icons/tag.svg") !important;
     }
     /* Bookmark */
     :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) {
@@ -10573,8 +10598,15 @@
     #BMB_bookmarksPopup #BMB_bookmarksToolbar,
     #bookmarksMenuPopup #bookmarksToolbarFolderMenu,
     :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
-      treechildren::-moz-tree-image(container, queryFolder_toolbar_____) {
-      list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important;
+      treechildren::-moz-tree-image(container, queryFolder_toolbar_____),
+    #editBMPanel_folderMenuList[selectedGuid="toolbar_____"],
+    #editBMPanel_toolbarFolderItem,
+    #bookmarksToolbarFolderMenu,
+    #BMB_bookmarksToolbar,
+    #panelMenu_bookmarksToolbar,
+    #bookmarks-toolbar-button,
+    #bookmarks-toolbar-placeholder {
+      list-style-image: url("../icons/bookmarks-toolbar-alt.svg") !important;
     }
     /* Bookmark Menu */
     :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
@@ -10611,7 +10643,7 @@
     #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"],
     :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
       treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) {
-      list-style-image: url("../icons/bookmarksToolbar-open.svg") !important;
+      list-style-image: url("../icons/bookmarksToolbar-open-alt.svg") !important;
     }
     /* Bookmark Menu */
     :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
@@ -10790,9 +10822,12 @@
       background-size: 16px !important;
       background-image: var(--avatar-image-url) !important;
     }
+    #new-tab-button {
+      list-style-image: var(--uc-new-tab-icon) !important;
+    }
     @supports -moz-bool-pref("userChrome.icon.panel_full") or -moz-bool-pref("userChrome.icon.panel_photon") {
       #appMenu-new-tab-button2 {
-        list-style-image: url("chrome://browser/skin/new-tab.svg");
+        list-style-image: var(--uc-new-tab-icon);
       }
     }
     @supports -moz-bool-pref("userChrome.icon.panel_photon") {
@@ -10873,6 +10908,33 @@
     #open-file-button {
       list-style-image: url("../icons/toolbarButton-upload.svg") !important;
     }
+    #cut-button {
+      list-style-image: url("../icons/edit-cut.svg") !important;
+    }
+    #copy-button {
+      list-style-image: url("../icons/edit-copy.svg") !important;
+    }
+    #paste-button {
+      list-style-image: url("../icons/edit-paste.svg") !important;
+    }
+    #characterencoding-button {
+      list-style-image: url("../icons/characterEncoding.svg") !important;
+    }
+    #screenshot-button {
+      list-style-image: url("../icons/screenshot-1.svg") !important;
+    }
+    #email-link-button {
+      list-style-image: url("../icons/mail.svg") !important;
+    }
+    #panic-button {
+      list-style-image: url("../icons/forget.svg") !important;
+    }
+    #profiler-button-button > .toolbarbutton-icon {
+      list-style-image: url("../icons/performance.svg") !important;
+    }
+    #developer-button {
+      list-style-image: url("../icons/wrench-filled.svg") !important;
+    }
     #appMenu-settings-button {
       list-style-image: url("chrome://global/skin/icons/settings.svg");
     }
@@ -10996,14 +11058,14 @@
       list-style-image: url("chrome://global/skin/icons/search-glass.svg");
     }
     #panelMenu_viewBookmarksToolbar {
-      list-style-image: url("chrome://browser/skin/bookmarks-toolbar.svg");
+      list-style-image: url("../icons/bookmarks-toolbar-alt.svg");
     }
     #panelMenu_showAllBookmarks {
       list-style-image: url("chrome://browser/skin/bookmark-star-on-tray.svg");
     }
     /*= Panel - History ==========================================================*/
     #appMenuRecentlyClosedTabs {
-      list-style-image: url("chrome://browser/skin/tab.svg");
+      list-style-image: var(--uc-tab-icon);
     }
     #appMenuRecentlyClosedWindows {
       list-style-image: url("chrome://browser/skin/window.svg");
@@ -11016,7 +11078,7 @@
       list-style-image: url("../icons/restore-session.svg");
     }
     #appMenuClearRecentHistory {
-      list-style-image: url("chrome://browser/skin/forget.svg");
+      list-style-image: url("../icons/forget.svg");
     }
     #PanelUI-historyMore {
       list-style-image: url("chrome://browser/skin/history.svg");
@@ -11162,7 +11224,7 @@
       --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg");
     }
     #BMB_bookmarksToolbar {
-      --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg");
+      --menuitem-image: url("../icons/bookmarks-toolbar-alt.svg");
     }
     @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
       #BMB_bookmarksShowAllTop {
@@ -11737,7 +11799,7 @@
       #treestyletab_piro_sakura_ne_jp-menuitem-_context_newTab,
       #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenAlternatePosition,
       #sidebartabs_asamuzak_jp-menuitem-_newTab {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        --menuitem-image: var(--uc-new-tab-icon);
       }
       #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenInWindow {
         --menuitem-image: url("chrome://browser/skin/window.svg");
@@ -11789,10 +11851,10 @@
       #treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab,
       #tabcenter-reborn_ariasuni-menuitem-_contextMenuDuplicateTab,
       #sidebartabs_asamuzak_jp-menuitem-_dupeTab {
-        --menuitem-image: url("../icons/tab-copy.svg");
+        --menuitem-image: var(--uc-tab-copy-icon);
       }
       #tabcenter-reborn_ariasuni-menuitem-_contextMenuUnloadTab {
-        --menuitem-image: url("../icons/tab-unload.svg");
+        --menuitem-image: var(--uc-tab-unload-icon);
       }
       #context_bookmarkTab,
       #context_bookmarkSelectedTabs,
@@ -11835,7 +11897,7 @@
       #treestyletab_piro_sakura_ne_jp-menuitem-_context_selectAllTabs,
       #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_selectAllTabs,
       #sidebartabs_asamuzak_jp-menuitem-_selectAllTabs {
-        --menuitem-image: url("../icons/tab-multiple.svg");
+        --menuitem-image: var(--uc-tab-multiple-icon);
       }
       #context_closeTab,
       #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeTab,
@@ -11893,7 +11955,7 @@
         --menuitem-image: url("../icons/drawer-arrow-download.svg");
       }
       #toolbar-context-openANewTab {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        --menuitem-image: var(--uc-new-tab-icon);
       }
       #toolbar-context-reloadSelectedTab,
       #toolbar-context-reloadSelectedTabs {
@@ -11904,7 +11966,7 @@
         --menuitem-image: url("chrome://browser/skin/bookmark.svg");
       }
       #toolbar-context-selectAllTabs {
-        --menuitem-image: url("../icons/tab-multiple.svg");
+        --menuitem-image: var(--uc-tab-multiple-icon);
       }
       #toolbar-context-undoCloseTab {
         --menuitem-image: url("../icons/undo.svg");
@@ -11915,7 +11977,7 @@
       }
       #toggle_PersonalToolbar {
         /* Also placeContext */
-        --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg");
+        --menuitem-image: url("../icons/bookmarks-toolbar-alt.svg");
       }
       menuitem.viewCustomizeToolbar {
         --menuitem-image: url("chrome://browser/skin/customize.svg");
@@ -12007,10 +12069,10 @@
         --menuitem-image: url("../icons/link-square.svg");
       }
       #context-openlinkincontainertab {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        --menuitem-image: var(--uc-new-tab-icon);
       }
       #context-openlinkintab {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        --menuitem-image: var(--uc-new-tab-icon);
       }
       #context-openlinkinusercontext-menu {
         --menuitem-image: url("../icons/container-openin-16.svg");
@@ -12031,11 +12093,17 @@
         --menuitem-image: url("../icons/pocket-outline.svg");
       }
       #context-copyemail {
-        --menuitem-image: url("chrome://browser/skin/mail.svg");
+        --menuitem-image: url("../icons/mail.svg");
+      }
+      #context-copyphone {
+        --menuitem-image: url("../icons/device-phone.svg");
       }
       #context-copylink {
         --menuitem-image: url("../icons/link.svg");
       }
+      #context-stripOnShareLink {
+        --menuitem-image: url("../icons/link-no-tracking.svg");
+      }
       #context-sendlinktodevice {
         --menuitem-image: url("../icons/send-to-device.svg");
       }
@@ -12106,7 +12174,7 @@
       #context-sendimage,
       #context-sendvideo,
       #context-sendaudio {
-        --menuitem-image: url("chrome://browser/skin/mail.svg");
+        --menuitem-image: url("../icons/mail.svg");
       }
       #context-viewimageinfo {
         --menuitem-image: url("chrome://global/skin/icons/info.svg");
@@ -12150,13 +12218,13 @@
         }
       }
       #context-cut {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        --menuitem-image: url("../icons/edit-cut.svg");
       }
       #context-copy {
         --menuitem-image: url("../icons/edit-copy.svg");
       }
       #context-paste {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       #context-delete {
         --menuitem-image: url("chrome://global/skin/icons/delete.svg");
@@ -12171,7 +12239,7 @@
         --menuitem-image: url("chrome://global/skin/icons/print.svg");
       }
       #context-take-screenshot {
-        --menuitem-image: url("chrome://browser/skin/screenshot.svg");
+        --menuitem-image: url("../icons/screenshot-1.svg");
       }
       #context-keywordfield {
         --menuitem-image: url("chrome://browser/skin/bookmark.svg");
@@ -12204,7 +12272,7 @@
         --menuitem-image: url("../icons/document-search.svg");
       }
       #context-inspect-a11y {
-        --menuitem-image: url("chrome://devtools/skin/images/tool-accessibility.svg");
+        --menuitem-image: url("../icons/tool-accessibility.svg");
       }
       #context-inspect {
         --menuitem-image: url("../icons/command-pick.svg");
@@ -12234,7 +12302,7 @@
         --menuitem-image: url("../icons/eye-show.svg");
       }
       #context-openframeintab {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        --menuitem-image: var(--uc-new-tab-icon);
       }
       #context-openframe {
         --menuitem-image: url("chrome://browser/skin/window.svg");
@@ -12252,7 +12320,7 @@
         --menuitem-image: url("chrome://global/skin/icons/print.svg");
       }
       #context-take-frame-screenshot {
-        --menuitem-image: url("chrome://browser/skin/screenshot.svg");
+        --menuitem-image: url("../icons/screenshot-1.svg");
       }
       #context-viewframesource {
         --menuitem-image: url("../icons/document-search.svg");
@@ -12265,19 +12333,19 @@
         --menuitem-image: url("../icons/timer10.svg");
       }
       #tm-linkWithhistory {
-        --menuitem-image: url("../icons/new-tab-skip-forward.svg");
+        --menuitem-image: var(--uc-new-tab-skip-forward-icon);
       }
       #tm-openAllLinks {
-        --menuitem-image: url("../icons/new-tab-multiple.svg");
+        --menuitem-image: var(--uc-new-tab-multiple-icon);
       }
       #tm-openinverselink {
-        --menuitem-image: url("../icons/new-tab-forward.svg");
+        --menuitem-image: var(--uc-new-tab-forward-icon);
       }
       #tm-content-closetab {
         --menuitem-image: url("../icons/dismiss-filled.svg");
       }
       #tm-duplicateTabContext {
-        --menuitem-image: url("../icons/tab-copy.svg");
+        --menuitem-image: var(--uc-tab-copy-icon);
       }
       #tm-duplicateinWinContext {
         --menuitem-image: url("../icons/tab-desktop-multiple-bottom.svg");
@@ -12353,7 +12421,7 @@
       #placesContext_open\:newtab,
       #placesContext_openContainer\:tabs,
       #placesContext_openLinks\:tabs {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        --menuitem-image: var(--uc-new-tab-icon);
       }
       #placesContext_open\:newcontainertab {
         --menuitem-image: url("../icons/container-openin-16.svg");
@@ -12382,13 +12450,13 @@
         --menuitem-image: url("../icons/text-sort-ascending.svg");
       }
       #placesContext_cut {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        --menuitem-image: url("../icons/edit-cut.svg");
       }
       #placesContext_copy {
         --menuitem-image: url("../icons/edit-copy.svg");
       }
       #placesContext_paste_group {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       #placesContext_new\:bookmark {
         --menuitem-image: url("chrome://browser/skin/bookmark.svg");
@@ -12401,7 +12469,7 @@
         --menuitem-image: url("../icons/vertical-line.svg");
       }
       #placesContext_paste {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       #placesContext_createBookmark {
         --menuitem-image: url("chrome://browser/skin/bookmark.svg");
@@ -12488,7 +12556,7 @@
         --menuitem-image: url("../icons/link-square.svg");
       }
       #syncedTabsOpenSelectedInTab {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        --menuitem-image: var(--uc-new-tab-icon);
       }
       #syncedTabsOpenSelectedInWindow {
         --menuitem-image: url("chrome://browser/skin/window.svg");
@@ -12516,13 +12584,13 @@
         --menuitem-image: url("../icons/undo.svg");
       }
       #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_cut"] {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        --menuitem-image: url("../icons/edit-cut.svg");
       }
       #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_copy"] {
         --menuitem-image: url("../icons/edit-copy.svg");
       }
       #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_paste"] {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_delete"] {
         --menuitem-image: url("chrome://global/skin/icons/delete.svg");
@@ -12543,13 +12611,18 @@
         }
       }
       #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_cut"] {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        --menuitem-image: url("../icons/edit-cut.svg");
       }
       #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_copy"] {
         --menuitem-image: url("../icons/edit-copy.svg");
       }
+      @supports -moz-bool-pref("userChrome.icon.menu.full") {
+        #strip-on-share {
+          --menuitem-image: url("../icons/link-no-tracking.svg");
+        }
+      }
       #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_paste"] {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       @supports -moz-bool-pref("userChrome.icon.menu.full") {
         #paste-and-go {
@@ -12573,13 +12646,13 @@
         }
       }
       .textbox-contextmenu > menuitem[data-l10n-id="text-action-cut"] {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        --menuitem-image: url("../icons/edit-cut.svg");
       }
       .textbox-contextmenu > menuitem[data-l10n-id="text-action-copy"] {
         --menuitem-image: url("../icons/edit-copy.svg");
       }
       .textbox-contextmenu > menuitem[data-l10n-id="text-action-paste"] {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       .textbox-contextmenu > menuitem[data-l10n-id="text-action-delete"] {
         --menuitem-image: url("chrome://global/skin/icons/delete.svg");
@@ -12594,23 +12667,23 @@
         }
       }
       menuitem.searchbar-clear-history {
-        --menuitem-image: url("chrome://browser/skin/forget.svg");
+        --menuitem-image: url("../icons/forget.svg");
       }
       /*= context_sendTabToDevicePopupMenu =========================================*/
       .sync-menuitem.sendtab-target[clientType="phone"] {
-        --menuitem-image: url("chrome://browser/skin/device-phone.svg");
+        --menuitem-image: url("../icons/device-phone.svg");
       }
       .sync-menuitem.sendtab-target[clientType="tablet"] {
-        --menuitem-image: url("chrome://browser/skin/device-tablet.svg");
+        --menuitem-image: url("../icons/device-tablet.svg");
       }
       .sync-menuitem.sendtab-target[clientType="desktop"] {
-        --menuitem-image: url("chrome://browser/skin/device-desktop.svg");
+        --menuitem-image: url("../icons/device-desktop.svg");
       }
       .sync-menuitem.sendtab-target[clientType="tv"] {
-        --menuitem-image: url("chrome://browser/skin/device-tv.svg");
+        --menuitem-image: url("../icons/device-tv.svg");
       }
       .sync-menuitem.sendtab-target[clientType="vr"] {
-        --menuitem-image: url("chrome://browser/skin/device-vr.svg");
+        --menuitem-image: url("../icons/device-vr.svg");
       }
       .sync-menuitem.sendtab-target[clientType=""] {
         --menuitem-image: url("../icons/send-to-device.svg");
@@ -12670,7 +12743,7 @@
       /** Global Menu ***************************************************************/
       /*= menu_FilePopup ===========================================================*/
       #menu_newNavigatorTab {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        --menuitem-image: var(--uc-new-tab-icon);
       }
       #menu_newUserContext {
         --menuitem-image: url("../icons/container-openin-16.svg");
@@ -12688,7 +12761,7 @@
         --menuitem-image: url("../icons/toolbarButton-download.svg");
       }
       #menu_sendLink {
-        --menuitem-image: url("chrome://browser/skin/mail.svg");
+        --menuitem-image: url("../icons/mail.svg");
       }
       menu.share-tab-url-item {
         --menuitem-image: url("chrome://browser/skin/share.svg");
@@ -12720,13 +12793,13 @@
         }
       }
       #menu_cut {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        --menuitem-image: url("../icons/edit-cut.svg");
       }
       #menu_copy {
         --menuitem-image: url("../icons/edit-copy.svg");
       }
       #menu_paste {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       #menu_delete {
         --menuitem-image: url("chrome://global/skin/icons/delete.svg");
@@ -12754,7 +12827,7 @@
         --menuitem-image: url("../icons/document-css.svg");
       }
       #repair-text-encoding {
-        --menuitem-image: url("chrome://browser/skin/characterEncoding.svg");
+        --menuitem-image: url("../icons/characterEncoding.svg");
       }
       #enterFullScreenItem {
         --menuitem-image: url("chrome://browser/skin/fullscreen.svg");
@@ -12770,7 +12843,7 @@
         --menuitem-image: url("chrome://browser/skin/reader-mode.svg");
       }
       #menu_showAllTabs {
-        --menuitem-image: url("../icons/tab.svg");
+        --menuitem-image: var(--uc-tab-icon);
       }
       #documentDirection-swap {
         --menuitem-image: url("../icons/text-direction-horizontal-ltr.svg");
@@ -12809,7 +12882,7 @@
         --menuitem-image: url("chrome://browser/skin/history.svg");
       }
       #sanitizeItem {
-        --menuitem-image: url("chrome://browser/skin/forget.svg");
+        --menuitem-image: url("../icons/forget.svg");
       }
       #sync-tabs-menuitem {
         --menuitem-image: url("chrome://browser/skin/sync.svg");
@@ -12824,7 +12897,7 @@
         --menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
       }
       #historyUndoMenu {
-        --menuitem-image: url("chrome://browser/skin/tab.svg");
+        --menuitem-image: var(--uc-tab-icon);
       }
       #historyUndoWindowMenu {
         --menuitem-image: url("chrome://browser/skin/window.svg");
@@ -12963,13 +13036,13 @@
         }
       }
       #orgCut {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        --menuitem-image: url("../icons/edit-cut.svg");
       }
       #orgCopy {
         --menuitem-image: url("../icons/edit-copy.svg");
       }
       #orgPaste {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       #orgDelete {
         --menuitem-image: url("chrome://global/skin/icons/delete.svg");
@@ -13094,10 +13167,10 @@
       stroke: transparent !important;
     }
     #unloadWebpanelMenu {
-      --menuitem-image: url("../icons/tab-unload.svg");
+      --menuitem-image: var(--uc-tab-unload-icon);
     }
     #changeUAWebpanelMenu {
-      --menuitem-image: url("chrome://devtools/skin/images/command-responsivemode.svg");
+      --menuitem-image: url("../icons/command-responsivemode.svg");
       fill-opacity: 0;
     }
     #deleteWebpanelMenu {
@@ -24641,6 +24714,14 @@
   /** Icons - List **************************************************************/
   :root {
     --uc-folder-icon: url("chrome://global/skin/icons/folder.svg");
+    --uc-tab-icon: url("../icons/tab.svg");
+    --uc-tab-copy-icon: url("../icons/tab-copy.svg");
+    --uc-tab-unload-icon: url("../icons/tab-unload.svg");
+    --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg");
+    --uc-new-tab-icon: url("../icons/new-tab.svg");
+    --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg");
+    --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple.svg");
+    --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward.svg");
     --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg");
     --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.svg");
   }
@@ -24657,6 +24738,18 @@
     --uc-folder-icon: url("../icons/folder.svg");
   }
 }
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.tab.connect_to_window") {
+  :root {
+    --uc-tab-icon: url("../icons/tab-photon.svg");
+    --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg");
+    --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg");
+    --uc-tab-multiple-icon: url("../icons/tab-multiple.svg");
+    --uc-new-tab-icon: url("../icons/new-tab-photon.svg");
+    --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg");
+    --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple-photon.svg");
+    --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward-photon.svg");
+  }
+}
 @media not (-moz-bool-pref: "userChrome.icon.disabled") {
   @supports selector(:has(a)) {
     :root:has(#sidebar-box[positionend="true"]) {
@@ -24665,6 +24758,12 @@
     }
   }
 }
+@media not (-moz-bool-pref: "userChrome.icon.disabled") {
+  .urlbarView-row[source="tabs"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon,
+  #urlbar-engine-one-off-item-tabs {
+    list-style-image: var(--uc-tab-icon) !important;
+  }
+}
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.library") {
   /*= Standard Folder - More Visible ===========================================*/
   /* on Toolbar and Menus */
@@ -24725,8 +24824,9 @@
   }
   /* Tag */
   :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer),
-  :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) {
-    list-style-image: url("chrome://browser/skin/places/tag.svg") !important;
+  :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v),
+  .bookmark-item[query][tagContainer] {
+    list-style-image: url("../icons/tag.svg") !important;
   }
   /* Bookmark */
   :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) {
@@ -24736,8 +24836,15 @@
   #BMB_bookmarksPopup #BMB_bookmarksToolbar,
   #bookmarksMenuPopup #bookmarksToolbarFolderMenu,
   :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
-    treechildren::-moz-tree-image(container, queryFolder_toolbar_____) {
-    list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important;
+    treechildren::-moz-tree-image(container, queryFolder_toolbar_____),
+  #editBMPanel_folderMenuList[selectedGuid="toolbar_____"],
+  #editBMPanel_toolbarFolderItem,
+  #bookmarksToolbarFolderMenu,
+  #BMB_bookmarksToolbar,
+  #panelMenu_bookmarksToolbar,
+  #bookmarks-toolbar-button,
+  #bookmarks-toolbar-placeholder {
+    list-style-image: url("../icons/bookmarks-toolbar-alt.svg") !important;
   }
   /* Bookmark Menu */
   :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
@@ -24774,7 +24881,7 @@
   #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"],
   :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
     treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) {
-    list-style-image: url("../icons/bookmarksToolbar-open.svg") !important;
+    list-style-image: url("../icons/bookmarksToolbar-open-alt.svg") !important;
   }
   /* Bookmark Menu */
   :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
@@ -25020,10 +25127,15 @@
     background-image: var(--avatar-image-url) !important;
   }
 }
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #new-tab-button {
+    list-style-image: var(--uc-new-tab-icon) !important;
+  }
+}
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.panel_full"),
   (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.panel_photon") {
   #appMenu-new-tab-button2 {
-    list-style-image: url("chrome://browser/skin/new-tab.svg");
+    list-style-image: var(--uc-new-tab-icon);
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "userChrome.icon.panel_photon") {
@@ -25119,6 +25231,51 @@
     list-style-image: url("../icons/toolbarButton-upload.svg") !important;
   }
 }
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #cut-button {
+    list-style-image: url("../icons/edit-cut.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #copy-button {
+    list-style-image: url("../icons/edit-copy.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #paste-button {
+    list-style-image: url("../icons/edit-paste.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #characterencoding-button {
+    list-style-image: url("../icons/characterEncoding.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #screenshot-button {
+    list-style-image: url("../icons/screenshot-1.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #email-link-button {
+    list-style-image: url("../icons/mail.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #panic-button {
+    list-style-image: url("../icons/forget.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #profiler-button-button > .toolbarbutton-icon {
+    list-style-image: url("../icons/performance.svg") !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
+  #developer-button {
+    list-style-image: url("../icons/wrench-filled.svg") !important;
+  }
+}
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
   #appMenu-settings-button {
     list-style-image: url("chrome://global/skin/icons/settings.svg");
@@ -25278,7 +25435,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
   #panelMenu_viewBookmarksToolbar {
-    list-style-image: url("chrome://browser/skin/bookmarks-toolbar.svg");
+    list-style-image: url("../icons/bookmarks-toolbar-alt.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
@@ -25288,7 +25445,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
   #appMenuRecentlyClosedTabs {
-    list-style-image: url("chrome://browser/skin/tab.svg");
+    list-style-image: var(--uc-tab-icon);
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
@@ -25309,7 +25466,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
   #appMenuClearRecentHistory {
-    list-style-image: url("chrome://browser/skin/forget.svg");
+    list-style-image: url("../icons/forget.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
@@ -25514,7 +25671,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") {
   #BMB_bookmarksToolbar {
-    --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg");
+    --menuitem-image: url("../icons/bookmarks-toolbar-alt.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.panel") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
@@ -26112,7 +26269,7 @@
   #treestyletab_piro_sakura_ne_jp-menuitem-_context_newTab,
   #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenAlternatePosition,
   #sidebartabs_asamuzak_jp-menuitem-_newTab {
-    --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+    --menuitem-image: var(--uc-new-tab-icon);
   }
   #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenInWindow {
     --menuitem-image: url("chrome://browser/skin/window.svg");
@@ -26164,10 +26321,10 @@
   #treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab,
   #tabcenter-reborn_ariasuni-menuitem-_contextMenuDuplicateTab,
   #sidebartabs_asamuzak_jp-menuitem-_dupeTab {
-    --menuitem-image: url("../icons/tab-copy.svg");
+    --menuitem-image: var(--uc-tab-copy-icon);
   }
   #tabcenter-reborn_ariasuni-menuitem-_contextMenuUnloadTab {
-    --menuitem-image: url("../icons/tab-unload.svg");
+    --menuitem-image: var(--uc-tab-unload-icon);
   }
   #context_bookmarkTab,
   #context_bookmarkSelectedTabs,
@@ -26238,7 +26395,7 @@
   #treestyletab_piro_sakura_ne_jp-menuitem-_context_selectAllTabs,
   #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_selectAllTabs,
   #sidebartabs_asamuzak_jp-menuitem-_selectAllTabs {
-    --menuitem-image: url("../icons/tab-multiple.svg");
+    --menuitem-image: var(--uc-tab-multiple-icon);
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -26318,7 +26475,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #toolbar-context-openANewTab {
-    --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+    --menuitem-image: var(--uc-new-tab-icon);
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -26335,7 +26492,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #toolbar-context-selectAllTabs {
-    --menuitem-image: url("../icons/tab-multiple.svg");
+    --menuitem-image: var(--uc-tab-multiple-icon);
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -26352,7 +26509,7 @@
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #toggle_PersonalToolbar {
     /* Also placeContext */
-    --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg");
+    --menuitem-image: url("../icons/bookmarks-toolbar-alt.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -26478,12 +26635,12 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #context-openlinkincontainertab {
-    --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+    --menuitem-image: var(--uc-new-tab-icon);
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #context-openlinkintab {
-    --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+    --menuitem-image: var(--uc-new-tab-icon);
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -26518,7 +26675,12 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #context-copyemail {
-    --menuitem-image: url("chrome://browser/skin/mail.svg");
+    --menuitem-image: url("../icons/mail.svg");
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-copyphone {
+    --menuitem-image: url("../icons/device-phone.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -26526,6 +26688,11 @@
     --menuitem-image: url("../icons/link.svg");
   }
 }
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
+  #context-stripOnShareLink {
+    --menuitem-image: url("../icons/link-no-tracking.svg");
+  }
+}
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #context-sendlinktodevice {
     --menuitem-image: url("../icons/send-to-device.svg");
@@ -26639,7 +26806,7 @@
   #context-sendimage,
   #context-sendvideo,
   #context-sendaudio {
-    --menuitem-image: url("chrome://browser/skin/mail.svg");
+    --menuitem-image: url("../icons/mail.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -26709,7 +26876,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #context-cut {
-    --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+    --menuitem-image: url("../icons/edit-cut.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -26719,7 +26886,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #context-paste {
-    --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+    --menuitem-image: url("../icons/edit-paste.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -26744,7 +26911,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #context-take-screenshot {
-    --menuitem-image: url("chrome://browser/skin/screenshot.svg");
+    --menuitem-image: url("../icons/screenshot-1.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -26797,7 +26964,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #context-inspect-a11y {
-    --menuitem-image: url("chrome://devtools/skin/images/tool-accessibility.svg");
+    --menuitem-image: url("../icons/tool-accessibility.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -26834,7 +27001,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #context-openframeintab {
-    --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+    --menuitem-image: var(--uc-new-tab-icon);
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -26864,7 +27031,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #context-take-frame-screenshot {
-    --menuitem-image: url("chrome://browser/skin/screenshot.svg");
+    --menuitem-image: url("../icons/screenshot-1.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -26884,17 +27051,17 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #tm-linkWithhistory {
-    --menuitem-image: url("../icons/new-tab-skip-forward.svg");
+    --menuitem-image: var(--uc-new-tab-skip-forward-icon);
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #tm-openAllLinks {
-    --menuitem-image: url("../icons/new-tab-multiple.svg");
+    --menuitem-image: var(--uc-new-tab-multiple-icon);
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #tm-openinverselink {
-    --menuitem-image: url("../icons/new-tab-forward.svg");
+    --menuitem-image: var(--uc-new-tab-forward-icon);
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -26904,7 +27071,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #tm-duplicateTabContext {
-    --menuitem-image: url("../icons/tab-copy.svg");
+    --menuitem-image: var(--uc-tab-copy-icon);
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -27020,7 +27187,7 @@
   #placesContext_open\:newtab,
   #placesContext_openContainer\:tabs,
   #placesContext_openLinks\:tabs {
-    --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+    --menuitem-image: var(--uc-new-tab-icon);
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -27065,7 +27232,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #placesContext_cut {
-    --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+    --menuitem-image: url("../icons/edit-cut.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -27075,7 +27242,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #placesContext_paste_group {
-    --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+    --menuitem-image: url("../icons/edit-paste.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -27096,7 +27263,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #placesContext_paste {
-    --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+    --menuitem-image: url("../icons/edit-paste.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -27219,7 +27386,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #syncedTabsOpenSelectedInTab {
-    --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+    --menuitem-image: var(--uc-new-tab-icon);
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -27264,7 +27431,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_cut"] {
-    --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+    --menuitem-image: url("../icons/edit-cut.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -27274,7 +27441,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_paste"] {
-    --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+    --menuitem-image: url("../icons/edit-paste.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -27304,7 +27471,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_cut"] {
-    --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+    --menuitem-image: url("../icons/edit-cut.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -27312,9 +27479,14 @@
     --menuitem-image: url("../icons/edit-copy.svg");
   }
 }
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
+  #strip-on-share {
+    --menuitem-image: url("../icons/link-no-tracking.svg");
+  }
+}
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_paste"] {
-    --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+    --menuitem-image: url("../icons/edit-paste.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") and (-moz-bool-pref: "userChrome.icon.menu.full") {
@@ -27344,7 +27516,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   .textbox-contextmenu > menuitem[data-l10n-id="text-action-cut"] {
-    --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+    --menuitem-image: url("../icons/edit-cut.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -27354,7 +27526,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   .textbox-contextmenu > menuitem[data-l10n-id="text-action-paste"] {
-    --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+    --menuitem-image: url("../icons/edit-paste.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
@@ -27374,24 +27546,24 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   menuitem.searchbar-clear-history {
-    --menuitem-image: url("chrome://browser/skin/forget.svg");
+    --menuitem-image: url("../icons/forget.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.context_menu") {
   .sync-menuitem.sendtab-target[clientType="phone"] {
-    --menuitem-image: url("chrome://browser/skin/device-phone.svg");
+    --menuitem-image: url("../icons/device-phone.svg");
   }
   .sync-menuitem.sendtab-target[clientType="tablet"] {
-    --menuitem-image: url("chrome://browser/skin/device-tablet.svg");
+    --menuitem-image: url("../icons/device-tablet.svg");
   }
   .sync-menuitem.sendtab-target[clientType="desktop"] {
-    --menuitem-image: url("chrome://browser/skin/device-desktop.svg");
+    --menuitem-image: url("../icons/device-desktop.svg");
   }
   .sync-menuitem.sendtab-target[clientType="tv"] {
-    --menuitem-image: url("chrome://browser/skin/device-tv.svg");
+    --menuitem-image: url("../icons/device-tv.svg");
   }
   .sync-menuitem.sendtab-target[clientType="vr"] {
-    --menuitem-image: url("chrome://browser/skin/device-vr.svg");
+    --menuitem-image: url("../icons/device-vr.svg");
   }
   .sync-menuitem.sendtab-target[clientType=""] {
     --menuitem-image: url("../icons/send-to-device.svg");
@@ -27461,7 +27633,7 @@
   /** Global Menu ***************************************************************/
   /*= menu_FilePopup ===========================================================*/
   #menu_newNavigatorTab {
-    --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+    --menuitem-image: var(--uc-new-tab-icon);
   }
   #menu_newUserContext {
     --menuitem-image: url("../icons/container-openin-16.svg");
@@ -27479,7 +27651,7 @@
     --menuitem-image: url("../icons/toolbarButton-download.svg");
   }
   #menu_sendLink {
-    --menuitem-image: url("chrome://browser/skin/mail.svg");
+    --menuitem-image: url("../icons/mail.svg");
   }
   menu.share-tab-url-item {
     --menuitem-image: url("chrome://browser/skin/share.svg");
@@ -27524,7 +27696,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
   #menu_cut {
-    --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+    --menuitem-image: url("../icons/edit-cut.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
@@ -27534,7 +27706,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
   #menu_paste {
-    --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+    --menuitem-image: url("../icons/edit-paste.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
@@ -27579,7 +27751,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
   #repair-text-encoding {
-    --menuitem-image: url("chrome://browser/skin/characterEncoding.svg");
+    --menuitem-image: url("../icons/characterEncoding.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
@@ -27605,7 +27777,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
   #menu_showAllTabs {
-    --menuitem-image: url("../icons/tab.svg");
+    --menuitem-image: var(--uc-tab-icon);
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
@@ -27662,7 +27834,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
   #sanitizeItem {
-    --menuitem-image: url("chrome://browser/skin/forget.svg");
+    --menuitem-image: url("../icons/forget.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
@@ -27687,7 +27859,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
   #historyUndoMenu {
-    --menuitem-image: url("chrome://browser/skin/tab.svg");
+    --menuitem-image: var(--uc-tab-icon);
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
@@ -27892,7 +28064,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
   #orgCut {
-    --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+    --menuitem-image: url("../icons/edit-cut.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
@@ -27902,7 +28074,7 @@
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
   #orgPaste {
-    --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+    --menuitem-image: url("../icons/edit-paste.svg");
   }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.library") {
@@ -28038,10 +28210,10 @@
     stroke: transparent !important;
   }
   #unloadWebpanelMenu {
-    --menuitem-image: url("../icons/tab-unload.svg");
+    --menuitem-image: var(--uc-tab-unload-icon);
   }
   #changeUAWebpanelMenu {
-    --menuitem-image: url("chrome://devtools/skin/images/command-responsivemode.svg");
+    --menuitem-image: url("../icons/command-responsivemode.svg");
     fill-opacity: 0;
   }
   #deleteWebpanelMenu {
diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css
index 2b1fc991..5c21a7cb 100644
--- a/css/leptonChromeESR.css
+++ b/css/leptonChromeESR.css
@@ -10904,6 +10904,14 @@
   /** Icons - List **************************************************************/
   :root {
     --uc-folder-icon: url("chrome://global/skin/icons/folder.svg");
+    --uc-tab-icon: url("../icons/tab.svg");
+    --uc-tab-copy-icon: url("../icons/tab-copy.svg");
+    --uc-tab-unload-icon: url("../icons/tab-unload.svg");
+    --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg");
+    --uc-new-tab-icon: url("../icons/new-tab.svg");
+    --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg");
+    --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple.svg");
+    --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward.svg");
     --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg");
     --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.svg");
   }
@@ -10912,12 +10920,28 @@
       --uc-folder-icon: url("../icons/folder.svg");
     }
   }
+  @supports -moz-bool-pref("userChrome.tab.connect_to_window") {
+    :root {
+      --uc-tab-icon: url("../icons/tab-photon.svg");
+      --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg");
+      --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg");
+      --uc-tab-multiple-icon: url("../icons/tab-multiple.svg");
+      --uc-new-tab-icon: url("../icons/new-tab-photon.svg");
+      --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg");
+      --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple-photon.svg");
+      --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward-photon.svg");
+    }
+  }
   @supports selector(:has(a)) {
     :root:has(#sidebar-box[positionend="true"]) {
       --uc-sidebar-icon: url("chrome://browser/skin/sidebars-right.svg");
       --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars.svg");
     }
   }
+  .urlbarView-row[source="tabs"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon,
+  #urlbar-engine-one-off-item-tabs {
+    list-style-image: var(--uc-tab-icon) !important;
+  }
   /** Library - Icons Replace ***************************************************/
   @supports -moz-bool-pref("userChrome.icon.library") {
     /*= Standard Folder - More Visible ===========================================*/
@@ -10979,8 +11003,9 @@
     }
     /* Tag */
     :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer),
-    :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) {
-      list-style-image: url("chrome://browser/skin/places/tag.svg") !important;
+    :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v),
+    .bookmark-item[query][tagContainer] {
+      list-style-image: url("../icons/tag.svg") !important;
     }
     /* Bookmark */
     :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) {
@@ -10990,8 +11015,15 @@
     #BMB_bookmarksPopup #BMB_bookmarksToolbar,
     #bookmarksMenuPopup #bookmarksToolbarFolderMenu,
     :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
-      treechildren::-moz-tree-image(container, queryFolder_toolbar_____) {
-      list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important;
+      treechildren::-moz-tree-image(container, queryFolder_toolbar_____),
+    #editBMPanel_folderMenuList[selectedGuid="toolbar_____"],
+    #editBMPanel_toolbarFolderItem,
+    #bookmarksToolbarFolderMenu,
+    #BMB_bookmarksToolbar,
+    #panelMenu_bookmarksToolbar,
+    #bookmarks-toolbar-button,
+    #bookmarks-toolbar-placeholder {
+      list-style-image: url("../icons/bookmarks-toolbar-alt.svg") !important;
     }
     /* Bookmark Menu */
     :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
@@ -11028,7 +11060,7 @@
     #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"],
     :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
       treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) {
-      list-style-image: url("../icons/bookmarksToolbar-open.svg") !important;
+      list-style-image: url("../icons/bookmarksToolbar-open-alt.svg") !important;
     }
     /* Bookmark Menu */
     :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
@@ -11207,9 +11239,12 @@
       background-size: 16px !important;
       background-image: var(--avatar-image-url) !important;
     }
+    #new-tab-button {
+      list-style-image: var(--uc-new-tab-icon) !important;
+    }
     @supports -moz-bool-pref("userChrome.icon.panel_full") or -moz-bool-pref("userChrome.icon.panel_photon") {
       #appMenu-new-tab-button2 {
-        list-style-image: url("chrome://browser/skin/new-tab.svg");
+        list-style-image: var(--uc-new-tab-icon);
       }
     }
     @supports -moz-bool-pref("userChrome.icon.panel_photon") {
@@ -11290,6 +11325,33 @@
     #open-file-button {
       list-style-image: url("../icons/toolbarButton-upload.svg") !important;
     }
+    #cut-button {
+      list-style-image: url("../icons/edit-cut.svg") !important;
+    }
+    #copy-button {
+      list-style-image: url("../icons/edit-copy.svg") !important;
+    }
+    #paste-button {
+      list-style-image: url("../icons/edit-paste.svg") !important;
+    }
+    #characterencoding-button {
+      list-style-image: url("../icons/characterEncoding.svg") !important;
+    }
+    #screenshot-button {
+      list-style-image: url("../icons/screenshot-1.svg") !important;
+    }
+    #email-link-button {
+      list-style-image: url("../icons/mail.svg") !important;
+    }
+    #panic-button {
+      list-style-image: url("../icons/forget.svg") !important;
+    }
+    #profiler-button-button > .toolbarbutton-icon {
+      list-style-image: url("../icons/performance.svg") !important;
+    }
+    #developer-button {
+      list-style-image: url("../icons/wrench-filled.svg") !important;
+    }
     #appMenu-settings-button {
       list-style-image: url("chrome://global/skin/icons/settings.svg");
     }
@@ -11413,14 +11475,14 @@
       list-style-image: url("chrome://global/skin/icons/search-glass.svg");
     }
     #panelMenu_viewBookmarksToolbar {
-      list-style-image: url("chrome://browser/skin/bookmarks-toolbar.svg");
+      list-style-image: url("../icons/bookmarks-toolbar-alt.svg");
     }
     #panelMenu_showAllBookmarks {
       list-style-image: url("chrome://browser/skin/bookmark-star-on-tray.svg");
     }
     /*= Panel - History ==========================================================*/
     #appMenuRecentlyClosedTabs {
-      list-style-image: url("chrome://browser/skin/tab.svg");
+      list-style-image: var(--uc-tab-icon);
     }
     #appMenuRecentlyClosedWindows {
       list-style-image: url("chrome://browser/skin/window.svg");
@@ -11433,7 +11495,7 @@
       list-style-image: url("../icons/restore-session.svg");
     }
     #appMenuClearRecentHistory {
-      list-style-image: url("chrome://browser/skin/forget.svg");
+      list-style-image: url("../icons/forget.svg");
     }
     #PanelUI-historyMore {
       list-style-image: url("chrome://browser/skin/history.svg");
@@ -11579,7 +11641,7 @@
       --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg");
     }
     #BMB_bookmarksToolbar {
-      --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg");
+      --menuitem-image: url("../icons/bookmarks-toolbar-alt.svg");
     }
     @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
       #BMB_bookmarksShowAllTop {
@@ -12343,7 +12405,7 @@
       #treestyletab_piro_sakura_ne_jp-menuitem-_context_newTab,
       #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenAlternatePosition,
       #sidebartabs_asamuzak_jp-menuitem-_newTab {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        --menuitem-image: var(--uc-new-tab-icon);
       }
       #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenInWindow {
         --menuitem-image: url("chrome://browser/skin/window.svg");
@@ -12395,10 +12457,10 @@
       #treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab,
       #tabcenter-reborn_ariasuni-menuitem-_contextMenuDuplicateTab,
       #sidebartabs_asamuzak_jp-menuitem-_dupeTab {
-        --menuitem-image: url("../icons/tab-copy.svg");
+        --menuitem-image: var(--uc-tab-copy-icon);
       }
       #tabcenter-reborn_ariasuni-menuitem-_contextMenuUnloadTab {
-        --menuitem-image: url("../icons/tab-unload.svg");
+        --menuitem-image: var(--uc-tab-unload-icon);
       }
       #context_bookmarkTab,
       #context_bookmarkSelectedTabs,
@@ -12441,7 +12503,7 @@
       #treestyletab_piro_sakura_ne_jp-menuitem-_context_selectAllTabs,
       #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_selectAllTabs,
       #sidebartabs_asamuzak_jp-menuitem-_selectAllTabs {
-        --menuitem-image: url("../icons/tab-multiple.svg");
+        --menuitem-image: var(--uc-tab-multiple-icon);
       }
       #context_closeTab,
       #treestyletab_piro_sakura_ne_jp-menuitem-_context_closeTab,
@@ -12499,7 +12561,7 @@
         --menuitem-image: url("../icons/drawer-arrow-download.svg");
       }
       #toolbar-context-openANewTab {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        --menuitem-image: var(--uc-new-tab-icon);
       }
       #toolbar-context-reloadSelectedTab,
       #toolbar-context-reloadSelectedTabs {
@@ -12510,7 +12572,7 @@
         --menuitem-image: url("chrome://browser/skin/bookmark.svg");
       }
       #toolbar-context-selectAllTabs {
-        --menuitem-image: url("../icons/tab-multiple.svg");
+        --menuitem-image: var(--uc-tab-multiple-icon);
       }
       #toolbar-context-undoCloseTab {
         --menuitem-image: url("../icons/undo.svg");
@@ -12521,7 +12583,7 @@
       }
       #toggle_PersonalToolbar {
         /* Also placeContext */
-        --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg");
+        --menuitem-image: url("../icons/bookmarks-toolbar-alt.svg");
       }
       menuitem.viewCustomizeToolbar {
         --menuitem-image: url("chrome://browser/skin/customize.svg");
@@ -12616,10 +12678,10 @@
         --menuitem-image: url("../icons/link-square.svg");
       }
       #context-openlinkincontainertab {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        --menuitem-image: var(--uc-new-tab-icon);
       }
       #context-openlinkintab {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        --menuitem-image: var(--uc-new-tab-icon);
       }
       #context-openlinkinusercontext-menu {
         --menuitem-image: url("../icons/container-openin-16.svg");
@@ -12640,11 +12702,17 @@
         --menuitem-image: url("../icons/pocket-outline.svg");
       }
       #context-copyemail {
-        --menuitem-image: url("chrome://browser/skin/mail.svg");
+        --menuitem-image: url("../icons/mail.svg");
+      }
+      #context-copyphone {
+        --menuitem-image: url("../icons/device-phone.svg");
       }
       #context-copylink {
         --menuitem-image: url("../icons/link.svg");
       }
+      #context-stripOnShareLink {
+        --menuitem-image: url("../icons/link-no-tracking.svg");
+      }
       #context-sendlinktodevice {
         --menuitem-image: url("../icons/send-to-device.svg");
       }
@@ -12715,7 +12783,7 @@
       #context-sendimage,
       #context-sendvideo,
       #context-sendaudio {
-        --menuitem-image: url("chrome://browser/skin/mail.svg");
+        --menuitem-image: url("../icons/mail.svg");
       }
       #context-viewimageinfo {
         --menuitem-image: url("chrome://global/skin/icons/info.svg");
@@ -12759,13 +12827,13 @@
         }
       }
       #context-cut {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        --menuitem-image: url("../icons/edit-cut.svg");
       }
       #context-copy {
         --menuitem-image: url("../icons/edit-copy.svg");
       }
       #context-paste {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       #context-delete {
         --menuitem-image: url("chrome://global/skin/icons/delete.svg");
@@ -12780,7 +12848,7 @@
         --menuitem-image: url("chrome://global/skin/icons/print.svg");
       }
       #context-take-screenshot {
-        --menuitem-image: url("chrome://browser/skin/screenshot.svg");
+        --menuitem-image: url("../icons/screenshot-1.svg");
       }
       #context-keywordfield {
         --menuitem-image: url("chrome://browser/skin/bookmark.svg");
@@ -12813,7 +12881,7 @@
         --menuitem-image: url("../icons/document-search.svg");
       }
       #context-inspect-a11y {
-        --menuitem-image: url("chrome://devtools/skin/images/tool-accessibility.svg");
+        --menuitem-image: url("../icons/tool-accessibility.svg");
       }
       #context-inspect {
         --menuitem-image: url("../icons/command-pick.svg");
@@ -12843,7 +12911,7 @@
         --menuitem-image: url("../icons/eye-show.svg");
       }
       #context-openframeintab {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        --menuitem-image: var(--uc-new-tab-icon);
       }
       #context-openframe {
         --menuitem-image: url("chrome://browser/skin/window.svg");
@@ -12861,7 +12929,7 @@
         --menuitem-image: url("chrome://global/skin/icons/print.svg");
       }
       #context-take-frame-screenshot {
-        --menuitem-image: url("chrome://browser/skin/screenshot.svg");
+        --menuitem-image: url("../icons/screenshot-1.svg");
       }
       #context-viewframesource {
         --menuitem-image: url("../icons/document-search.svg");
@@ -12874,19 +12942,19 @@
         --menuitem-image: url("../icons/timer10.svg");
       }
       #tm-linkWithhistory {
-        --menuitem-image: url("../icons/new-tab-skip-forward.svg");
+        --menuitem-image: var(--uc-new-tab-skip-forward-icon);
       }
       #tm-openAllLinks {
-        --menuitem-image: url("../icons/new-tab-multiple.svg");
+        --menuitem-image: var(--uc-new-tab-multiple-icon);
       }
       #tm-openinverselink {
-        --menuitem-image: url("../icons/new-tab-forward.svg");
+        --menuitem-image: var(--uc-new-tab-forward-icon);
       }
       #tm-content-closetab {
         --menuitem-image: url("../icons/dismiss-filled.svg");
       }
       #tm-duplicateTabContext {
-        --menuitem-image: url("../icons/tab-copy.svg");
+        --menuitem-image: var(--uc-tab-copy-icon);
       }
       #tm-duplicateinWinContext {
         --menuitem-image: url("../icons/tab-desktop-multiple-bottom.svg");
@@ -12962,7 +13030,7 @@
       #placesContext_open\:newtab,
       #placesContext_openContainer\:tabs,
       #placesContext_openLinks\:tabs {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        --menuitem-image: var(--uc-new-tab-icon);
       }
       #placesContext_open\:newcontainertab {
         --menuitem-image: url("../icons/container-openin-16.svg");
@@ -12991,13 +13059,13 @@
         --menuitem-image: url("../icons/text-sort-ascending.svg");
       }
       #placesContext_cut {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        --menuitem-image: url("../icons/edit-cut.svg");
       }
       #placesContext_copy {
         --menuitem-image: url("../icons/edit-copy.svg");
       }
       #placesContext_paste_group {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       #placesContext_new\:bookmark {
         --menuitem-image: url("chrome://browser/skin/bookmark.svg");
@@ -13010,7 +13078,7 @@
         --menuitem-image: url("../icons/vertical-line.svg");
       }
       #placesContext_paste {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       #placesContext_createBookmark {
         --menuitem-image: url("chrome://browser/skin/bookmark.svg");
@@ -13097,7 +13165,7 @@
         --menuitem-image: url("../icons/link-square.svg");
       }
       #syncedTabsOpenSelectedInTab {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        --menuitem-image: var(--uc-new-tab-icon);
       }
       #syncedTabsOpenSelectedInWindow {
         --menuitem-image: url("chrome://browser/skin/window.svg");
@@ -13125,13 +13193,13 @@
         --menuitem-image: url("../icons/undo.svg");
       }
       #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_cut"] {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        --menuitem-image: url("../icons/edit-cut.svg");
       }
       #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_copy"] {
         --menuitem-image: url("../icons/edit-copy.svg");
       }
       #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_paste"] {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_delete"] {
         --menuitem-image: url("chrome://global/skin/icons/delete.svg");
@@ -13152,13 +13220,18 @@
         }
       }
       #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_cut"] {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        --menuitem-image: url("../icons/edit-cut.svg");
       }
       #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_copy"] {
         --menuitem-image: url("../icons/edit-copy.svg");
       }
+      @supports -moz-bool-pref("userChrome.icon.menu.full") {
+        #strip-on-share {
+          --menuitem-image: url("../icons/link-no-tracking.svg");
+        }
+      }
       #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_paste"] {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       @supports -moz-bool-pref("userChrome.icon.menu.full") {
         #paste-and-go {
@@ -13182,13 +13255,13 @@
         }
       }
       .textbox-contextmenu > menuitem[data-l10n-id="text-action-cut"] {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        --menuitem-image: url("../icons/edit-cut.svg");
       }
       .textbox-contextmenu > menuitem[data-l10n-id="text-action-copy"] {
         --menuitem-image: url("../icons/edit-copy.svg");
       }
       .textbox-contextmenu > menuitem[data-l10n-id="text-action-paste"] {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       .textbox-contextmenu > menuitem[data-l10n-id="text-action-delete"] {
         --menuitem-image: url("chrome://global/skin/icons/delete.svg");
@@ -13203,23 +13276,23 @@
         }
       }
       menuitem.searchbar-clear-history {
-        --menuitem-image: url("chrome://browser/skin/forget.svg");
+        --menuitem-image: url("../icons/forget.svg");
       }
       /*= context_sendTabToDevicePopupMenu =========================================*/
       .sync-menuitem.sendtab-target[clientType="phone"] {
-        --menuitem-image: url("chrome://browser/skin/device-phone.svg");
+        --menuitem-image: url("../icons/device-phone.svg");
       }
       .sync-menuitem.sendtab-target[clientType="tablet"] {
-        --menuitem-image: url("chrome://browser/skin/device-tablet.svg");
+        --menuitem-image: url("../icons/device-tablet.svg");
       }
       .sync-menuitem.sendtab-target[clientType="desktop"] {
-        --menuitem-image: url("chrome://browser/skin/device-desktop.svg");
+        --menuitem-image: url("../icons/device-desktop.svg");
       }
       .sync-menuitem.sendtab-target[clientType="tv"] {
-        --menuitem-image: url("chrome://browser/skin/device-tv.svg");
+        --menuitem-image: url("../icons/device-tv.svg");
       }
       .sync-menuitem.sendtab-target[clientType="vr"] {
-        --menuitem-image: url("chrome://browser/skin/device-vr.svg");
+        --menuitem-image: url("../icons/device-vr.svg");
       }
       .sync-menuitem.sendtab-target[clientType=""] {
         --menuitem-image: url("../icons/send-to-device.svg");
@@ -13279,7 +13352,7 @@
       /** Global Menu ***************************************************************/
       /*= menu_FilePopup ===========================================================*/
       #menu_newNavigatorTab {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        --menuitem-image: var(--uc-new-tab-icon);
       }
       #menu_newUserContext {
         --menuitem-image: url("../icons/container-openin-16.svg");
@@ -13297,7 +13370,7 @@
         --menuitem-image: url("../icons/toolbarButton-download.svg");
       }
       #menu_sendLink {
-        --menuitem-image: url("chrome://browser/skin/mail.svg");
+        --menuitem-image: url("../icons/mail.svg");
       }
       menu.share-tab-url-item {
         --menuitem-image: url("chrome://browser/skin/share.svg");
@@ -13329,13 +13402,13 @@
         }
       }
       #menu_cut {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        --menuitem-image: url("../icons/edit-cut.svg");
       }
       #menu_copy {
         --menuitem-image: url("../icons/edit-copy.svg");
       }
       #menu_paste {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       #menu_delete {
         --menuitem-image: url("chrome://global/skin/icons/delete.svg");
@@ -13363,7 +13436,7 @@
         --menuitem-image: url("../icons/document-css.svg");
       }
       #repair-text-encoding {
-        --menuitem-image: url("chrome://browser/skin/characterEncoding.svg");
+        --menuitem-image: url("../icons/characterEncoding.svg");
       }
       #enterFullScreenItem {
         --menuitem-image: url("chrome://browser/skin/fullscreen.svg");
@@ -13379,7 +13452,7 @@
         --menuitem-image: url("chrome://browser/skin/reader-mode.svg");
       }
       #menu_showAllTabs {
-        --menuitem-image: url("../icons/tab.svg");
+        --menuitem-image: var(--uc-tab-icon);
       }
       #documentDirection-swap {
         --menuitem-image: url("../icons/text-direction-horizontal-ltr.svg");
@@ -13418,7 +13491,7 @@
         --menuitem-image: url("chrome://browser/skin/history.svg");
       }
       #sanitizeItem {
-        --menuitem-image: url("chrome://browser/skin/forget.svg");
+        --menuitem-image: url("../icons/forget.svg");
       }
       #sync-tabs-menuitem {
         --menuitem-image: url("chrome://browser/skin/sync.svg");
@@ -13433,7 +13506,7 @@
         --menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
       }
       #historyUndoMenu {
-        --menuitem-image: url("chrome://browser/skin/tab.svg");
+        --menuitem-image: var(--uc-tab-icon);
       }
       #historyUndoWindowMenu {
         --menuitem-image: url("chrome://browser/skin/window.svg");
@@ -13572,13 +13645,13 @@
         }
       }
       #orgCut {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        --menuitem-image: url("../icons/edit-cut.svg");
       }
       #orgCopy {
         --menuitem-image: url("../icons/edit-copy.svg");
       }
       #orgPaste {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       #orgDelete {
         --menuitem-image: url("chrome://global/skin/icons/delete.svg");
@@ -13703,10 +13776,10 @@
       stroke: transparent !important;
     }
     #unloadWebpanelMenu {
-      --menuitem-image: url("../icons/tab-unload.svg");
+      --menuitem-image: var(--uc-tab-unload-icon);
     }
     #changeUAWebpanelMenu {
-      --menuitem-image: url("chrome://devtools/skin/images/command-responsivemode.svg");
+      --menuitem-image: url("../icons/command-responsivemode.svg");
       fill-opacity: 0;
     }
     #deleteWebpanelMenu {
diff --git a/css/leptonContent.css b/css/leptonContent.css
index a3cf45a2..62041ecf 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -2265,8 +2265,9 @@
       }
       /* Tag */
       :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer),
-      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) {
-        list-style-image: url("chrome://browser/skin/places/tag.svg") !important;
+      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v),
+      .bookmark-item[query][tagContainer] {
+        list-style-image: url("../icons/tag.svg") !important;
       }
       /* Bookmark */
       :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) {
@@ -2276,8 +2277,15 @@
       #BMB_bookmarksPopup #BMB_bookmarksToolbar,
       #bookmarksMenuPopup #bookmarksToolbarFolderMenu,
       :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
-        treechildren::-moz-tree-image(container, queryFolder_toolbar_____) {
-        list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important;
+        treechildren::-moz-tree-image(container, queryFolder_toolbar_____),
+      #editBMPanel_folderMenuList[selectedGuid="toolbar_____"],
+      #editBMPanel_toolbarFolderItem,
+      #bookmarksToolbarFolderMenu,
+      #BMB_bookmarksToolbar,
+      #panelMenu_bookmarksToolbar,
+      #bookmarks-toolbar-button,
+      #bookmarks-toolbar-placeholder {
+        list-style-image: url("../icons/bookmarks-toolbar-alt.svg") !important;
       }
       /* Bookmark Menu */
       :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
@@ -2315,7 +2323,7 @@
       #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"],
       :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
         treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) {
-        list-style-image: url("../icons/bookmarksToolbar-open.svg") !important;
+        list-style-image: url("../icons/bookmarksToolbar-open-alt.svg") !important;
       }
       /* Bookmark Menu */
       :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
@@ -3406,7 +3414,7 @@
         #placesContext_open\:newtab,
         #placesContext_openContainer\:tabs,
         #placesContext_openLinks\:tabs {
-          --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+          --menuitem-image: var(--uc-new-tab-icon);
         }
         #placesContext_open\:newcontainertab {
           --menuitem-image: url("../icons/container-openin-16.svg");
@@ -3435,13 +3443,13 @@
           --menuitem-image: url("../icons/text-sort-ascending.svg");
         }
         #placesContext_cut {
-          --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+          --menuitem-image: url("../icons/edit-cut.svg");
         }
         #placesContext_copy {
           --menuitem-image: url("../icons/edit-copy.svg");
         }
         #placesContext_paste_group {
-          --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+          --menuitem-image: url("../icons/edit-paste.svg");
         }
         #placesContext_new\:bookmark {
           --menuitem-image: url("chrome://browser/skin/bookmark.svg");
@@ -3454,7 +3462,7 @@
           --menuitem-image: url("../icons/vertical-line.svg");
         }
         #placesContext_paste {
-          --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+          --menuitem-image: url("../icons/edit-paste.svg");
         }
         #placesContext_createBookmark {
           --menuitem-image: url("chrome://browser/skin/bookmark.svg");
@@ -3490,13 +3498,13 @@
           }
         }
         #orgCut {
-          --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+          --menuitem-image: url("../icons/edit-cut.svg");
         }
         #orgCopy {
           --menuitem-image: url("../icons/edit-copy.svg");
         }
         #orgPaste {
-          --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+          --menuitem-image: url("../icons/edit-paste.svg");
         }
         #orgDelete {
           --menuitem-image: url("chrome://global/skin/icons/delete.svg");
@@ -5882,8 +5890,9 @@
       }
       /* Tag */
       :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer),
-      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) {
-        list-style-image: url("chrome://browser/skin/places/tag.svg") !important;
+      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v),
+      .bookmark-item[query][tagContainer] {
+        list-style-image: url("../icons/tag.svg") !important;
       }
       /* Bookmark */
       :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) {
@@ -5893,8 +5902,15 @@
       #BMB_bookmarksPopup #BMB_bookmarksToolbar,
       #bookmarksMenuPopup #bookmarksToolbarFolderMenu,
       :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
-        treechildren::-moz-tree-image(container, queryFolder_toolbar_____) {
-        list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important;
+        treechildren::-moz-tree-image(container, queryFolder_toolbar_____),
+      #editBMPanel_folderMenuList[selectedGuid="toolbar_____"],
+      #editBMPanel_toolbarFolderItem,
+      #bookmarksToolbarFolderMenu,
+      #BMB_bookmarksToolbar,
+      #panelMenu_bookmarksToolbar,
+      #bookmarks-toolbar-button,
+      #bookmarks-toolbar-placeholder {
+        list-style-image: url("../icons/bookmarks-toolbar-alt.svg") !important;
       }
       /* Bookmark Menu */
       :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
@@ -5932,7 +5948,7 @@
       #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"],
       :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
         treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) {
-        list-style-image: url("../icons/bookmarksToolbar-open.svg") !important;
+        list-style-image: url("../icons/bookmarksToolbar-open-alt.svg") !important;
       }
       /* Bookmark Menu */
       :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
@@ -7103,7 +7119,7 @@
       #placesContext_open\:newtab,
       #placesContext_openContainer\:tabs,
       #placesContext_openLinks\:tabs {
-        --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+        --menuitem-image: var(--uc-new-tab-icon);
       }
       #placesContext_open\:newcontainertab {
         --menuitem-image: url("../icons/container-openin-16.svg");
@@ -7132,13 +7148,13 @@
         --menuitem-image: url("../icons/text-sort-ascending.svg");
       }
       #placesContext_cut {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        --menuitem-image: url("../icons/edit-cut.svg");
       }
       #placesContext_copy {
         --menuitem-image: url("../icons/edit-copy.svg");
       }
       #placesContext_paste_group {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       #placesContext_new\:bookmark {
         --menuitem-image: url("chrome://browser/skin/bookmark.svg");
@@ -7151,7 +7167,7 @@
         --menuitem-image: url("../icons/vertical-line.svg");
       }
       #placesContext_paste {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
       #placesContext_createBookmark {
         --menuitem-image: url("chrome://browser/skin/bookmark.svg");
@@ -7191,7 +7207,7 @@
     }
     @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
       #orgCut {
-        --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+        --menuitem-image: url("../icons/edit-cut.svg");
       }
     }
     @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
@@ -7201,7 +7217,7 @@
     }
     @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
       #orgPaste {
-        --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+        --menuitem-image: url("../icons/edit-paste.svg");
       }
     }
     @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menu") {
diff --git a/css/leptonContentESR.css b/css/leptonContentESR.css
index f042280f..c1f079d8 100644
--- a/css/leptonContentESR.css
+++ b/css/leptonContentESR.css
@@ -2268,8 +2268,9 @@
       }
       /* Tag */
       :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer),
-      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) {
-        list-style-image: url("chrome://browser/skin/places/tag.svg") !important;
+      :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v),
+      .bookmark-item[query][tagContainer] {
+        list-style-image: url("../icons/tag.svg") !important;
       }
       /* Bookmark */
       :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_allbms_____v) {
@@ -2279,8 +2280,15 @@
       #BMB_bookmarksPopup #BMB_bookmarksToolbar,
       #bookmarksMenuPopup #bookmarksToolbarFolderMenu,
       :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
-        treechildren::-moz-tree-image(container, queryFolder_toolbar_____) {
-        list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important;
+        treechildren::-moz-tree-image(container, queryFolder_toolbar_____),
+      #editBMPanel_folderMenuList[selectedGuid="toolbar_____"],
+      #editBMPanel_toolbarFolderItem,
+      #bookmarksToolbarFolderMenu,
+      #BMB_bookmarksToolbar,
+      #panelMenu_bookmarksToolbar,
+      #bookmarks-toolbar-button,
+      #bookmarks-toolbar-placeholder {
+        list-style-image: url("../icons/bookmarks-toolbar-alt.svg") !important;
       }
       /* Bookmark Menu */
       :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
@@ -2318,7 +2326,7 @@
       #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"],
       :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
         treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) {
-        list-style-image: url("../icons/bookmarksToolbar-open.svg") !important;
+        list-style-image: url("../icons/bookmarksToolbar-open-alt.svg") !important;
       }
       /* Bookmark Menu */
       :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
@@ -3545,7 +3553,7 @@
         #placesContext_open\:newtab,
         #placesContext_openContainer\:tabs,
         #placesContext_openLinks\:tabs {
-          --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+          --menuitem-image: var(--uc-new-tab-icon);
         }
         #placesContext_open\:newcontainertab {
           --menuitem-image: url("../icons/container-openin-16.svg");
@@ -3574,13 +3582,13 @@
           --menuitem-image: url("../icons/text-sort-ascending.svg");
         }
         #placesContext_cut {
-          --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+          --menuitem-image: url("../icons/edit-cut.svg");
         }
         #placesContext_copy {
           --menuitem-image: url("../icons/edit-copy.svg");
         }
         #placesContext_paste_group {
-          --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+          --menuitem-image: url("../icons/edit-paste.svg");
         }
         #placesContext_new\:bookmark {
           --menuitem-image: url("chrome://browser/skin/bookmark.svg");
@@ -3593,7 +3601,7 @@
           --menuitem-image: url("../icons/vertical-line.svg");
         }
         #placesContext_paste {
-          --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+          --menuitem-image: url("../icons/edit-paste.svg");
         }
         #placesContext_createBookmark {
           --menuitem-image: url("chrome://browser/skin/bookmark.svg");
@@ -3629,13 +3637,13 @@
           }
         }
         #orgCut {
-          --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+          --menuitem-image: url("../icons/edit-cut.svg");
         }
         #orgCopy {
           --menuitem-image: url("../icons/edit-copy.svg");
         }
         #orgPaste {
-          --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+          --menuitem-image: url("../icons/edit-paste.svg");
         }
         #orgDelete {
           --menuitem-image: url("chrome://global/skin/icons/delete.svg");
diff --git a/icons/command-reponsivemode.svg b/icons/command-reponsivemode.svg
deleted file mode 100644
index 74f72d31..00000000
--- a/icons/command-reponsivemode.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M5 5.25H2a.75.75 0 0 0-.75.75v8c0 .414.336.75.75.75h3a.75.75 0 0 0 .75-.75V6A.75.75 0 0 0 5 5.25ZM2 4a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h3a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M5 1.25h8a.75.75 0 0 1 .75.75v12a.75.75 0 0 1-.75.75H8V16h5a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2v1h1.25V2A.75.75 0 0 1 5 1.25Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/icons/command-responsivemode.svg b/icons/command-responsivemode.svg
index 66a48180..74f72d31 100644
--- a/icons/command-responsivemode.svg
+++ b/icons/command-responsivemode.svg
@@ -1,7 +1 @@
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
-   - License, v. 2.0. If a copy of the MPL was not distributed with this
-   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill #0c0c0d">
-  <path fill-opacity="context-fill-opacity" d="M1 4h5a1 1 0 0 1 1 1v10a1 1 0 0 1-1 1H1a1 1 0 0 1-1-1V5a1 1 0 0 1 1-1zm0 2v8h5V6H1z"/>
-  <path fill-opacity="context-fill-opacity" d="M5 0a2 2 0 0 0-2 2v1h2V2h8v12H8v2h5a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H5z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M5 5.25H2a.75.75 0 0 0-.75.75v8c0 .414.336.75.75.75h3a.75.75 0 0 0 .75-.75V6A.75.75 0 0 0 5 5.25ZM2 4a2 2 0 0 0-2 2v8a2 2 0 0 0 2 2h3a2 2 0 0 0 2-2V6a2 2 0 0 0-2-2H2Z" clip-rule="evenodd"/><path fill-rule="evenodd" d="M5 1.25h8a.75.75 0 0 1 .75.75v12a.75.75 0 0 1-.75.75H8V16h5a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H5a2 2 0 0 0-2 2v1h1.25V2A.75.75 0 0 1 5 1.25Z" clip-rule="evenodd"/></svg>
\ No newline at end of file
diff --git a/icons/tab-photon.svg b/icons/tab-photon.svg
new file mode 100644
index 00000000..2b0c392d
--- /dev/null
+++ b/icons/tab-photon.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <path fill="context-fill" fill-opacity="context-fill-opacity" d="M15 11h-1V5a2 2 0 0 0-2-2H4a2 2 0 0 0-2 2v6H1a1 1 0 0 0 0 2h14a1 1 0 1 0 0-2z"/>
+</svg>
\ No newline at end of file
diff --git a/icons/tab-unload-photon.svg b/icons/tab-unload-photon.svg
new file mode 100644
index 00000000..cc231b5b
--- /dev/null
+++ b/icons/tab-unload-photon.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity"><path fill-rule="evenodd" d="M3 3.25h10a.75.75 0 0 1 .75.75v4.402c.478.233.902.558 1.25.952V4a2 2 0 0 0-2-2H3a2 2 0 0 0-2 2v7a2 2 0 0 0 2 2h5.126a4.007 4.007 0 0 1-.118-1.25H3a.75.75 0 0 1-.75-.75V4A.75.75 0 0 1 3 3.25Z" clip-rule="evenodd"/><path d="M11.692 10.017c.443-.057.893.03 1.28.251.386.22.688.56.86.967.17.406.2.857.084 1.283-.115.425-.37.8-.724 1.069a2.048 2.048 0 0 1-2.47 0 1.999 1.999 0 0 1-.725-1.07.508.508 0 0 0-.98.26 2.998 2.998 0 0 0 1.087 1.603 3.072 3.072 0 0 0 3.705 0 2.998 2.998 0 0 0 1.087-1.604 2.96 2.96 0 0 0-.128-1.924 3.014 3.014 0 0 0-1.29-1.45 3.08 3.08 0 0 0-3.636.44L9 9v2.5h2.5l-.945-.945a2.04 2.04 0 0 1 1.137-.538Z"/></svg>
\ No newline at end of file
diff --git a/icons/tag-open-content.svg b/icons/tag.svg
similarity index 100%
rename from icons/tag-open-content.svg
rename to icons/tag.svg
diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss
index deb40253..95d9dcea 100644
--- a/src/icons/_global_menu.scss
+++ b/src/icons/_global_menu.scss
@@ -1,7 +1,7 @@
 /** Global Menu ***************************************************************/
 /*= menu_FilePopup ===========================================================*/
 #menu_newNavigatorTab {
-  --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+  --menuitem-image: var(--uc-new-tab-icon);
 }
 #menu_newUserContext {
   --menuitem-image: url("../icons/container-openin-16.svg");
@@ -30,7 +30,7 @@
   --menuitem-image: url("../icons/toolbarButton-download.svg");
 }
 #menu_sendLink {
-  --menuitem-image: url("chrome://browser/skin/mail.svg");
+  --menuitem-image: url("../icons/mail.svg");
 }
 menu.share-tab-url-item {
   --menuitem-image: url("chrome://browser/skin/share.svg");
@@ -70,13 +70,13 @@ menu.share-tab-url-item {
 }
 
 #menu_cut {
-  --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+  --menuitem-image: url("../icons/edit-cut.svg");
 }
 #menu_copy {
   --menuitem-image: url("../icons/edit-copy.svg");
 }
 #menu_paste {
-  --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+  --menuitem-image: url("../icons/edit-paste.svg");
 }
 #menu_delete {
   --menuitem-image: url("chrome://global/skin/icons/delete.svg");
@@ -115,7 +115,7 @@ menu.share-tab-url-item {
   --menuitem-image: url("../icons/document-css.svg");
 }
 #repair-text-encoding {
-  --menuitem-image: url("chrome://browser/skin/characterEncoding.svg");
+  --menuitem-image: url("../icons/characterEncoding.svg");
 }
 
 #enterFullScreenItem {
@@ -132,7 +132,7 @@ menu.share-tab-url-item {
   --menuitem-image: url("chrome://browser/skin/reader-mode.svg");
 }
 #menu_showAllTabs {
-  --menuitem-image: url("../icons/tab.svg");
+  --menuitem-image: var(--uc-tab-icon);
 }
 
 #documentDirection-swap {
@@ -177,7 +177,7 @@ menu.share-tab-url-item {
   --menuitem-image: url("chrome://browser/skin/history.svg");
 }
 #sanitizeItem {
-  --menuitem-image: url("chrome://browser/skin/forget.svg");
+  --menuitem-image: url("../icons/forget.svg");
 }
 
 #sync-tabs-menuitem {
@@ -193,7 +193,7 @@ menu.share-tab-url-item {
   --menuitem-image: url("chrome://global/skin/icons/search-glass.svg");
 }
 #historyUndoMenu {
-  --menuitem-image: url("chrome://browser/skin/tab.svg");
+  --menuitem-image: var(--uc-tab-icon);
 }
 #historyUndoWindowMenu {
   --menuitem-image: url("chrome://browser/skin/window.svg");
diff --git a/src/icons/_index.scss b/src/icons/_index.scss
index e579a1ab..168cb9c6 100644
--- a/src/icons/_index.scss
+++ b/src/icons/_index.scss
@@ -3,6 +3,25 @@
 :root {
   @include initIcons;
 
+  --uc-tab-icon: url("../icons/tab.svg");
+  --uc-tab-copy-icon: url("../icons/tab-copy.svg");
+  --uc-tab-unload-icon: url("../icons/tab-unload.svg");
+  --uc-tab-multiple-icon: url("../icons/tab-desktop-multiple.svg");
+  --uc-new-tab-icon: url("../icons/new-tab.svg");
+  --uc-new-tab-forward-icon: url("../icons/new-tab-forward.svg");
+  --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple.svg");
+  --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward.svg");
+  @include Option("userChrome.tab.connect_to_window") {
+    --uc-tab-icon: url("../icons/tab-photon.svg");
+    --uc-tab-copy-icon: url("../icons/tab-copy-photon.svg");
+    --uc-tab-unload-icon: url("../icons/tab-unload-photon.svg");
+    --uc-tab-multiple-icon: url("../icons/tab-multiple.svg");
+    --uc-new-tab-icon: url("../icons/new-tab-photon.svg");
+    --uc-new-tab-forward-icon: url("../icons/new-tab-forward-photon.svg");
+    --uc-new-tab-multiple-icon: url("../icons/new-tab-multiple-photon.svg");
+    --uc-new-tab-skip-forward-icon: url("../icons/new-tab-skip-forward-photon.svg");
+  }
+
   --uc-sidebar-icon: url("chrome://browser/skin/sidebars.svg");
   --uc-sidebar-icon-reverse: url("chrome://browser/skin/sidebars-right.svg");
   @include Has {
@@ -13,6 +32,12 @@
   }
 }
 
+
+.urlbarView-row[source="tabs"] > .urlbarView-row-inner > .urlbarView-no-wrap > .urlbarView-favicon,
+#urlbar-engine-one-off-item-tabs {
+  list-style-image: var(--uc-tab-icon) !important;
+}
+
 /** Library - Icons Replace ***************************************************/
 @include Option("userChrome.icon.library") {
   @import "../library/chrome";
diff --git a/src/icons/_library.scss b/src/icons/_library.scss
index 928803a8..a4791edb 100644
--- a/src/icons/_library.scss
+++ b/src/icons/_library.scss
@@ -19,13 +19,13 @@
 }
 
 #orgCut {
-  --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+  --menuitem-image: url("../icons/edit-cut.svg");
 }
 #orgCopy {
   --menuitem-image: url("../icons/edit-copy.svg");
 }
 #orgPaste {
-  --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+  --menuitem-image: url("../icons/edit-paste.svg");
 }
 #orgDelete {
   --menuitem-image: url("chrome://global/skin/icons/delete.svg");
diff --git a/src/icons/_panel.scss b/src/icons/_panel.scss
index 0c880b79..ddb1739c 100644
--- a/src/icons/_panel.scss
+++ b/src/icons/_panel.scss
@@ -24,9 +24,12 @@
   background-image: var(--avatar-image-url) !important;
 }
 
+#new-tab-button {
+  list-style-image: var(--uc-new-tab-icon) !important;
+}
 @include Option("userChrome.icon.panel_full", "userChrome.icon.panel_photon") {
   #appMenu-new-tab-button2 {
-    list-style-image: url("chrome://browser/skin/new-tab.svg");
+    list-style-image: var(--uc-new-tab-icon);
   }
 }
 @include Option("userChrome.icon.panel_photon") {
@@ -112,6 +115,36 @@
   list-style-image: url("../icons/toolbarButton-upload.svg") !important;
 }
 
+#cut-button {
+  list-style-image: url("../icons/edit-cut.svg") !important;
+}
+#copy-button {
+  list-style-image: url("../icons/edit-copy.svg") !important;
+}
+#paste-button {
+  list-style-image: url("../icons/edit-paste.svg") !important;
+}
+
+#characterencoding-button {
+  list-style-image: url("../icons/characterEncoding.svg") !important;
+}
+#screenshot-button {
+  list-style-image: url("../icons/screenshot-1.svg") !important;
+}
+#email-link-button {
+  list-style-image: url("../icons/mail.svg") !important;
+}
+
+#panic-button {
+  list-style-image: url("../icons/forget.svg") !important;
+}
+#profiler-button-button > .toolbarbutton-icon {
+  list-style-image: url("../icons/performance.svg") !important;
+}
+#developer-button {
+  list-style-image: url("../icons/wrench-filled.svg") !important;
+}
+
 #appMenu-settings-button {
   list-style-image: url("chrome://global/skin/icons/settings.svg");
 }
@@ -238,7 +271,7 @@ panelMenuBookmarkThisPage[starred] {
   list-style-image: url("chrome://global/skin/icons/search-glass.svg");
 }
 #panelMenu_viewBookmarksToolbar {
-  list-style-image: url("chrome://browser/skin/bookmarks-toolbar.svg");
+  list-style-image: url("../icons/bookmarks-toolbar-alt.svg");
 }
 
 #panelMenu_showAllBookmarks {
@@ -247,7 +280,7 @@ panelMenuBookmarkThisPage[starred] {
 
 /*= Panel - History ==========================================================*/
 #appMenuRecentlyClosedTabs {
-  list-style-image: url("chrome://browser/skin/tab.svg");
+  list-style-image: var(--uc-tab-icon);
 }
 #appMenuRecentlyClosedWindows {
   list-style-image: url("chrome://browser/skin/window.svg");
@@ -260,7 +293,7 @@ panelMenuBookmarkThisPage[starred] {
   list-style-image: url("../icons/restore-session.svg");
 }
 #appMenuClearRecentHistory {
-  list-style-image: url("chrome://browser/skin/forget.svg");
+  list-style-image: url("../icons/forget.svg");
 }
 
 #PanelUI-historyMore {
@@ -417,7 +450,7 @@ panelMenuBookmarkThisPage[starred] {
   --menuitem-image: url("chrome://browser/skin/bookmark-star-on-tray.svg");
 }
 #BMB_bookmarksToolbar {
-  --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg");
+  --menuitem-image: url("../icons/bookmarks-toolbar-alt.svg");
 }
 
 @include OS($mac) {
diff --git a/src/icons/context_menu/_content_area.scss b/src/icons/context_menu/_content_area.scss
index 8201c054..f3b34406 100644
--- a/src/icons/context_menu/_content_area.scss
+++ b/src/icons/context_menu/_content_area.scss
@@ -26,10 +26,10 @@
   --menuitem-image: url("../icons/link-square.svg");
 }
 #context-openlinkincontainertab {
-  --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+  --menuitem-image: var(--uc-new-tab-icon);
 }
 #context-openlinkintab {
-  --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+  --menuitem-image: var(--uc-new-tab-icon);
 }
 #context-openlinkinusercontext-menu {
   --menuitem-image: url("../icons/container-openin-16.svg");
@@ -51,11 +51,17 @@
   --menuitem-image: url("../icons/pocket-outline.svg");
 }
 #context-copyemail {
-  --menuitem-image: url("chrome://browser/skin/mail.svg");
+  --menuitem-image: url("../icons/mail.svg");
+}
+#context-copyphone {
+  --menuitem-image: url("../icons/device-phone.svg");
 }
 #context-copylink {
   --menuitem-image: url("../icons/link.svg");
 }
+#context-stripOnShareLink {
+  --menuitem-image: url("../icons/link-no-tracking.svg");
+}
 #context-sendlinktodevice {
   --menuitem-image: url("../icons/send-to-device.svg");
 }
@@ -129,7 +135,7 @@
 #context-sendimage,
 #context-sendvideo,
 #context-sendaudio {
-  --menuitem-image: url("chrome://browser/skin/mail.svg");
+  --menuitem-image: url("../icons/mail.svg");
 }
 #context-viewimageinfo {
   --menuitem-image: url("chrome://global/skin/icons/info.svg");
@@ -176,13 +182,13 @@
 }
 
 #context-cut {
-  --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+  --menuitem-image: url("../icons/edit-cut.svg");
 }
 #context-copy {
   --menuitem-image: url("../icons/edit-copy.svg");
 }
 #context-paste {
-  --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+  --menuitem-image: url("../icons/edit-paste.svg");
 }
 #context-delete {
   --menuitem-image: url("chrome://global/skin/icons/delete.svg");
@@ -198,7 +204,7 @@
 }
 
 #context-take-screenshot {
-  --menuitem-image: url("chrome://browser/skin/screenshot.svg");
+  --menuitem-image: url("../icons/screenshot-1.svg");
 }
 
 #context-keywordfield {
@@ -236,7 +242,7 @@
   --menuitem-image: url("../icons/document-search.svg");
 }
 #context-inspect-a11y {
-  --menuitem-image: url("chrome://devtools/skin/images/tool-accessibility.svg");
+  --menuitem-image: url("../icons/tool-accessibility.svg");
 }
 #context-inspect {
   --menuitem-image: url("../icons/command-pick.svg");
@@ -270,7 +276,7 @@
   --menuitem-image: url("../icons/eye-show.svg");
 }
 #context-openframeintab {
-  --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+  --menuitem-image: var(--uc-new-tab-icon);
 }
 #context-openframe {
   --menuitem-image: url("chrome://browser/skin/window.svg");
@@ -292,7 +298,7 @@
 }
 
 #context-take-frame-screenshot {
-  --menuitem-image: url("chrome://browser/skin/screenshot.svg");
+  --menuitem-image: url("../icons/screenshot-1.svg");
 }
 
 #context-viewframesource {
@@ -312,20 +318,20 @@
 
 #tm-linkWithhistory {
   // ic_fluent_skip_forward_tab_24_regular
-  --menuitem-image: url("../icons/new-tab-skip-forward.svg");
+  --menuitem-image: var(--uc-new-tab-skip-forward-icon);
 }
 #tm-openAllLinks {
-  --menuitem-image: url("../icons/new-tab-multiple.svg");
+  --menuitem-image: var(--uc-new-tab-multiple-icon);
 }
 #tm-openinverselink {
-  --menuitem-image: url("../icons/new-tab-forward.svg");
+  --menuitem-image: var(--uc-new-tab-forward-icon);
 }
 
 #tm-content-closetab {
   --menuitem-image: url("../icons/dismiss-filled.svg");
 }
 #tm-duplicateTabContext {
-  --menuitem-image: url("../icons/tab-copy.svg");
+  --menuitem-image: var(--uc-tab-copy-icon);
 }
 #tm-duplicateinWinContext {
   --menuitem-image: url("../icons/tab-desktop-multiple-bottom.svg");
diff --git a/src/icons/context_menu/_others.scss b/src/icons/context_menu/_others.scss
index 2d7871f5..8fe0d53a 100644
--- a/src/icons/context_menu/_others.scss
+++ b/src/icons/context_menu/_others.scss
@@ -84,7 +84,7 @@ menuitem[data-l10n-id="popup-show-popup-menuitem"] {
   --menuitem-image: url("../icons/link-square.svg");
 }
 #syncedTabsOpenSelectedInTab {
-  --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+  --menuitem-image: var(--uc-new-tab-icon);
 }
 #syncedTabsOpenSelectedInWindow {
   --menuitem-image: url("chrome://browser/skin/window.svg");
@@ -115,13 +115,13 @@ menuitem[data-l10n-id="popup-show-popup-menuitem"] {
   --menuitem-image: url("../icons/undo.svg");
 }
 #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_cut"] {
-  --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+  --menuitem-image: url("../icons/edit-cut.svg");
 }
 #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_copy"] {
   --menuitem-image: url("../icons/edit-copy.svg");
 }
 #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_paste"] {
-  --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+  --menuitem-image: url("../icons/edit-paste.svg");
 }
 #SyncedTabsSidebarTabsFilterContext > menuitem[cmd="cmd_delete"] {
   --menuitem-image: url("chrome://global/skin/icons/delete.svg");
@@ -146,13 +146,18 @@ menuitem[data-l10n-id="popup-show-popup-menuitem"] {
 }
 
 #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_cut"] {
-  --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+  --menuitem-image: url("../icons/edit-cut.svg");
 }
 #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_copy"] {
   --menuitem-image: url("../icons/edit-copy.svg");
 }
+#strip-on-share {
+  @include Option("userChrome.icon.menu.full") {
+    --menuitem-image: url("../icons/link-no-tracking.svg");
+  }
+}
 #urlbar-input-container .textbox-contextmenu menuitem[cmd="cmd_paste"] {
-  --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+  --menuitem-image: url("../icons/edit-paste.svg");
 }
 #paste-and-go {
   @include Option("userChrome.icon.menu.full") {
@@ -178,13 +183,13 @@ menuitem[data-l10n-id="popup-show-popup-menuitem"] {
 }
 
 .textbox-contextmenu > menuitem[data-l10n-id="text-action-cut"] {
-  --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+  --menuitem-image: url("../icons/edit-cut.svg");
 }
 .textbox-contextmenu > menuitem[data-l10n-id="text-action-copy"] {
   --menuitem-image: url("../icons/edit-copy.svg");
 }
 .textbox-contextmenu > menuitem[data-l10n-id="text-action-paste"] {
-  --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+  --menuitem-image: url("../icons/edit-paste.svg");
 }
 .textbox-contextmenu > menuitem[data-l10n-id="text-action-delete"] {
   --menuitem-image: url("chrome://global/skin/icons/delete.svg");
@@ -200,25 +205,25 @@ menuitem.searchbar-paste-and-search {
   }
 }
 menuitem.searchbar-clear-history {
-  --menuitem-image: url("chrome://browser/skin/forget.svg");
+  --menuitem-image: url("../icons/forget.svg");
 }
 
 /*= context_sendTabToDevicePopupMenu =========================================*/
 .sync-menuitem.sendtab-target {
   &[clientType="phone"] {
-    --menuitem-image: url("chrome://browser/skin/device-phone.svg");
+    --menuitem-image: url("../icons/device-phone.svg");
   }
   &[clientType="tablet"] {
-    --menuitem-image: url("chrome://browser/skin/device-tablet.svg");
+    --menuitem-image: url("../icons/device-tablet.svg");
   }
   &[clientType="desktop"] {
-    --menuitem-image: url("chrome://browser/skin/device-desktop.svg");
+    --menuitem-image: url("../icons/device-desktop.svg");
   }
   &[clientType="tv"] {
-    --menuitem-image: url("chrome://browser/skin/device-tv.svg");
+    --menuitem-image: url("../icons/device-tv.svg");
   }
   &[clientType="vr"] {
-    --menuitem-image: url("chrome://browser/skin/device-vr.svg");
+    --menuitem-image: url("../icons/device-vr.svg");
   }
   &[clientType=""] {
     --menuitem-image: url("../icons/send-to-device.svg");
diff --git a/src/icons/context_menu/_place.scss b/src/icons/context_menu/_place.scss
index 136ecaf0..ff23f51a 100644
--- a/src/icons/context_menu/_place.scss
+++ b/src/icons/context_menu/_place.scss
@@ -9,7 +9,7 @@
 #placesContext_open\:newtab,
 #placesContext_openContainer\:tabs,
 #placesContext_openLinks\:tabs {
-  --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+  --menuitem-image: var(--uc-new-tab-icon);
 }
 #placesContext_open\:newcontainertab {
   --menuitem-image: url("../icons/container-openin-16.svg");
@@ -40,13 +40,13 @@
 }
 
 #placesContext_cut {
-  --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
+  --menuitem-image: url("../icons/edit-cut.svg");
 }
 #placesContext_copy {
   --menuitem-image: url("../icons/edit-copy.svg");
 }
 #placesContext_paste_group {
-  --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+  --menuitem-image: url("../icons/edit-paste.svg");
 }
 
 #placesContext_new\:bookmark {
@@ -61,7 +61,7 @@
 }
 
 #placesContext_paste {
-  --menuitem-image: url("chrome://browser/skin/edit-paste.svg");
+  --menuitem-image: url("../icons/edit-paste.svg");
 }
 
 #placesContext_createBookmark {
diff --git a/src/icons/context_menu/_tab_toolbar.scss b/src/icons/context_menu/_tab_toolbar.scss
index f2acdcfa..d90a56f9 100644
--- a/src/icons/context_menu/_tab_toolbar.scss
+++ b/src/icons/context_menu/_tab_toolbar.scss
@@ -3,7 +3,7 @@
 #treestyletab_piro_sakura_ne_jp-menuitem-_context_newTab,
 #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenAlternatePosition,
 #sidebartabs_asamuzak_jp-menuitem-_newTab {
-  --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+  --menuitem-image: var(--uc-new-tab-icon);
 }
 #tabcenter-reborn_ariasuni-menuitem-_newTabContextMenuOpenInWindow {
   --menuitem-image: url("chrome://browser/skin/window.svg");
@@ -56,10 +56,10 @@
 #treestyletab_piro_sakura_ne_jp-menuitem-_context_duplicateTab,
 #tabcenter-reborn_ariasuni-menuitem-_contextMenuDuplicateTab,
 #sidebartabs_asamuzak_jp-menuitem-_dupeTab {
-  --menuitem-image: url("../icons/tab-copy.svg");
+  --menuitem-image: var(--uc-tab-copy-icon);
 }
 #tabcenter-reborn_ariasuni-menuitem-_contextMenuUnloadTab {
-  --menuitem-image: url("../icons/tab-unload.svg");
+  --menuitem-image: var(--uc-tab-unload-icon);
 }
 
 #context_bookmarkTab,
@@ -108,7 +108,7 @@
 #treestyletab_piro_sakura_ne_jp-menuitem-_context_selectAllTabs,
 #treestyletab_piro_sakura_ne_jp-menuitem-_noContextTab\:context_selectAllTabs,
 #sidebartabs_asamuzak_jp-menuitem-_selectAllTabs {
-  --menuitem-image: url("../icons/tab-multiple.svg");
+  --menuitem-image: var(--uc-tab-multiple-icon);
 }
 
 #sidebartabs_asamuzak_jp-menuitem-_tabGroup {
@@ -182,7 +182,7 @@
   --menuitem-image: url("../icons/drawer-arrow-download.svg");
 }
 #toolbar-context-openANewTab {
-  --menuitem-image: url("chrome://browser/skin/new-tab.svg");
+  --menuitem-image: var(--uc-new-tab-icon);
 }
 
 #toolbar-context-reloadSelectedTab,
@@ -194,7 +194,7 @@
   --menuitem-image: url("chrome://browser/skin/bookmark.svg");
 }
 #toolbar-context-selectAllTabs {
-  --menuitem-image: url("../icons/tab-multiple.svg");
+  --menuitem-image: var(--uc-tab-multiple-icon);
 }
 #toolbar-context-undoCloseTab {
   --menuitem-image: url("../icons/undo.svg");
@@ -206,7 +206,7 @@
 }
 #toggle_PersonalToolbar {
   /* Also placeContext */
-  --menuitem-image: url("chrome://browser/skin/bookmarks-toolbar.svg");
+  --menuitem-image: url("../icons/bookmarks-toolbar-alt.svg");
 }
 
 menuitem.viewCustomizeToolbar {
diff --git a/src/icons/fork_browsers/_floorp.scss b/src/icons/fork_browsers/_floorp.scss
index 2452ffa9..1e6e15bb 100644
--- a/src/icons/fork_browsers/_floorp.scss
+++ b/src/icons/fork_browsers/_floorp.scss
@@ -53,10 +53,10 @@
     stroke: transparent !important;
   }
   #unloadWebpanelMenu {
-    --menuitem-image: url("../icons/tab-unload.svg");
+    --menuitem-image: var(--uc-tab-unload-icon);
   }
   #changeUAWebpanelMenu {
-    --menuitem-image: url("chrome://devtools/skin/images/command-responsivemode.svg");
+    --menuitem-image: url("../icons/command-responsivemode.svg");
     fill-opacity: 0;
   }
   #deleteWebpanelMenu {
diff --git a/src/library/_folder_icons.scss b/src/library/_folder_icons.scss
index 9d0e6e8f..fa6f42ff 100644
--- a/src/library/_folder_icons.scss
+++ b/src/library/_folder_icons.scss
@@ -65,8 +65,9 @@
 
 /* Tag */
 :-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(title, query, tagContainer),
-:-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v) {
-  list-style-image: url("chrome://browser/skin/places/tag.svg") !important;
+:-moz-any(#placesList, #placeContent) treechildren::-moz-tree-image(query, OrganizerQuery_tags_______v),
+.bookmark-item[query][tagContainer] {
+  list-style-image: url("../icons/tag.svg") !important;
 }
 
 /* Bookmark */
@@ -77,8 +78,15 @@
 /* Bookmark Toolbar */
 #BMB_bookmarksPopup #BMB_bookmarksToolbar,       /* Original: Default folder icon */
 #bookmarksMenuPopup #bookmarksToolbarFolderMenu, /* Original: Default folder icon */
-:-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, queryFolder_toolbar_____) {
-  list-style-image: url("chrome://browser/skin/places/bookmarksToolbar.svg") !important;
+:-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent) treechildren::-moz-tree-image(container, queryFolder_toolbar_____),
+#editBMPanel_folderMenuList[selectedGuid="toolbar_____"],
+#editBMPanel_toolbarFolderItem,
+#bookmarksToolbarFolderMenu,
+#BMB_bookmarksToolbar,
+#panelMenu_bookmarksToolbar,
+#bookmarks-toolbar-button,
+#bookmarks-toolbar-placeholder {
+  list-style-image: url("../icons/bookmarks-toolbar-alt.svg") !important;
 }
 
 /* Bookmark Menu */
@@ -121,7 +129,7 @@
 #bookmarksMenuPopup #bookmarksToolbarFolderMenu[open="true"],
 :-moz-any(#bookmarks-view, #editBMPanel_folderTree, #placesList, #placeContent)
   treechildren::-moz-tree-image(container, open, queryFolder_toolbar_____) {
-  list-style-image: url("../icons/bookmarksToolbar-open.svg") !important;
+  list-style-image: url("../icons/bookmarksToolbar-open-alt.svg") !important;
 }
 
 /* Bookmark Menu */