diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 9bed326..0d2ee62 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -11660,7 +11660,7 @@
         --menuitem-image: url("../icons/checkmark-circle.svg");
       }
       .downloadUseSystemDefaultMenuItem {
-        --menuitem-image: url("chrome://browser/skin/open.svg");
+        --menuitem-image: url("../icons/toolbarButton-upload.svg");
       }
       .downloadAlwaysUseSystemDefaultMenuItem {
         /* checkbox */
@@ -12038,7 +12038,7 @@
         --menuitem-image: url("chrome://browser/skin/privateBrowsing.svg");
       }
       #menu_openFile {
-        --menuitem-image: url("chrome://browser/skin/open.svg");
+        --menuitem-image: url("../icons/toolbarButton-upload.svg");
       }
       #menu_savePage {
         --menuitem-image: url("../icons/toolbarButton-download.svg");
@@ -12318,6 +12318,11 @@
       #orgUndo {
         --menuitem-image: url("../icons/undo.svg");
       }
+      @supports -moz-bool-pref("userChrome.icon.menu.full") {
+        #orgRedo {
+          --menuitem-image: url("../icons/redo.svg");
+        }
+      }
       #orgCut {
         --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
       }
@@ -12345,13 +12350,18 @@
       }
       /*= maintenanceButtonPopup ===================================================*/
       #backupBookmarks {
-        --menuitem-image: url("chrome://devtools/skin/images/datastore.svg");
+        --menuitem-image: url("../icons/datastore.svg");
+      }
+      @supports -moz-bool-pref("userChrome.icon.menu.full") {
+        #fileRestoreMenu {
+          --menuitem-image: url("../icons/datarestore.svg");
+        }
       }
       #fileImport {
         --menuitem-image: url("../icons/toolbarButton-download.svg");
       }
       #fileExport {
-        --menuitem-image: url("chrome://browser/skin/open.svg");
+        --menuitem-image: url("../icons/toolbarButton-upload.svg");
       }
       #browserImport {
         --menuitem-image: url("chrome://browser/skin/import.svg");
diff --git a/css/leptonContent.css b/css/leptonContent.css
index a88b443..f86f8e9 100644
--- a/css/leptonContent.css
+++ b/css/leptonContent.css
@@ -3292,7 +3292,7 @@
           --menuitem-image: url("../icons/checkmark-circle.svg");
         }
         .downloadUseSystemDefaultMenuItem {
-          --menuitem-image: url("chrome://browser/skin/open.svg");
+          --menuitem-image: url("../icons/toolbarButton-upload.svg");
         }
         .downloadAlwaysUseSystemDefaultMenuItem {
           /* checkbox */
@@ -3428,6 +3428,11 @@
         #orgUndo {
           --menuitem-image: url("../icons/undo.svg");
         }
+        @supports -moz-bool-pref("userChrome.icon.menu.full") {
+          #orgRedo {
+            --menuitem-image: url("../icons/redo.svg");
+          }
+        }
         #orgCut {
           --menuitem-image: url("chrome://browser/skin/edit-cut.svg");
         }
@@ -3455,13 +3460,18 @@
         }
         /*= maintenanceButtonPopup ===================================================*/
         #backupBookmarks {
-          --menuitem-image: url("chrome://devtools/skin/images/datastore.svg");
+          --menuitem-image: url("../icons/datastore.svg");
+        }
+        @supports -moz-bool-pref("userChrome.icon.menu.full") {
+          #fileRestoreMenu {
+            --menuitem-image: url("../icons/datarestore.svg");
+          }
         }
         #fileImport {
           --menuitem-image: url("../icons/toolbarButton-download.svg");
         }
         #fileExport {
-          --menuitem-image: url("chrome://browser/skin/open.svg");
+          --menuitem-image: url("../icons/toolbarButton-upload.svg");
         }
         #browserImport {
           --menuitem-image: url("chrome://browser/skin/import.svg");
diff --git a/icons/datarestore.svg b/icons/datarestore.svg
new file mode 100644
index 0000000..34be076
--- /dev/null
+++ b/icons/datarestore.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <path d="M4.438 0a3 3 0 0 0-3 3v10a3 3 0 0 0 3 3h3.091a6 6 0 0 1-.62-1.213H4.437c-.553 0-1.788-1.235-1.788-1.787V3c0-.552 1.235-1.787 1.788-1.787h7.125c.552 0 1.787 1.235 1.787 1.787v3.742a6 6 0 0 1 1.213.303V3a3 3 0 0 0-3-3H4.436z"/>
+  <path d="M2.6 7v1h6.173a6 6 0 0 1 1.842-1H2.6z"/>
+  <rect width="4.8" height="1" x="5.6" y="4" rx=".6"/>
+  <path d="M6.2 10c-.333 0-.6.223-.6.5s.267.5.6.5h.554a6 6 0 0 1 .39-1H6.2zm5.898-1.177c-1.423.007-2.729.726-3.408 1.88V9.496c0-.3-.487-.3-.487 0v2.245c0 .124.11.224.243.224h2.435a.225.225 0 0 0 0-.449H9.344a.413.413 0 0 0 .027-.038c1.137-2.817 5.66-2.062 5.66.94 0 3-4.523 3.756-5.66.94-.235-.545-1.12-.24-.912.313 1.104 2.711 5.056 3.162 6.843.781 1.786-2.38-.064-5.633-3.204-5.63z"/>
+</svg>
diff --git a/icons/datastore.svg b/icons/datastore.svg
new file mode 100644
index 0000000..ee87f8c
--- /dev/null
+++ b/icons/datastore.svg
@@ -0,0 +1,6 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <path d="M4.437 0h7.126a3 3 0 0 1 3 3v10a3 3 0 0 1-3 3H4.437a3 3 0 0 1-3-3V3a3 3 0 0 1 3-3zm0 1.213C3.885 1.213 2.65 2.448 2.65 3v10c0 .552 1.235 1.787 1.787 1.787h7.126c.552 0 1.787-1.235 1.787-1.787V3c0-.552-1.235-1.787-1.787-1.787z"/>
+  <path d="M2.6 7h10.8v1H2.6Z"/>
+  <rect width="4.8" height="1" x="5.6" y="4" rx=".6"/>
+  <rect width="4.8" height="1" x="5.6" y="10" rx=".6"/>
+</svg>
diff --git a/icons/toolbarButton-upload.svg b/icons/toolbarButton-upload.svg
new file mode 100644
index 0000000..723f6fb
--- /dev/null
+++ b/icons/toolbarButton-upload.svg
@@ -0,0 +1,4 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+  <path d="M9.709 6.078h-1.84a.477.477 0 0 1-.337-.813l2.555-2.554a.477.477 0 0 1 .673 0l2.554 2.554c.3.3.088.813-.337.813h-1.84v2.796h.002v1.19h-.002v.786H9.71v-.785h-.003v-1.19h.004V6.078z"/>
+  <path d="M13.714 3.357h-.98l1.08 1.19h.067c.329 0 .429.267.429.596v7.619a.595.595 0 0 1-.596.595H2.286a.595.595 0 0 1-.596-.595V3.238c0-.328.267-.595.596-.595h3.47a.6.6 0 0 1 .442.197l.941 1.091c.112.126.211.138.38.138l.382-.35.347-.423-.576-.532-.59-.722a1.79 1.79 0 0 0-1.328-.59H2.286C1.3 1.452.5 2.252.5 3.237v9.524c0 .985.801 1.786 1.786 1.786h11.428c.985 0 1.786-.801 1.786-1.786v-7.62c0-.984-.801-1.785-1.786-1.785z"/>
+</svg>
diff --git a/src/icons/_global_menu.scss b/src/icons/_global_menu.scss
index 5b9e708..deb4025 100644
--- a/src/icons/_global_menu.scss
+++ b/src/icons/_global_menu.scss
@@ -19,7 +19,7 @@
 #menu_openLocation {
 }
 #menu_openFile {
-  --menuitem-image: url("chrome://browser/skin/open.svg");
+  --menuitem-image: url("../icons/toolbarButton-upload.svg");
 }
 #menu_close {
 }
diff --git a/src/icons/_library.scss b/src/icons/_library.scss
index a65d505..7ada433 100644
--- a/src/icons/_library.scss
+++ b/src/icons/_library.scss
@@ -16,6 +16,9 @@
   --menuitem-image: url("../icons/undo.svg");
 }
 #orgRedo {
+  @include Option("userChrome.icon.menu.full") {
+    --menuitem-image: url("../icons/redo.svg");
+  }
 }
 
 #orgCut {
@@ -49,16 +52,19 @@
 
 /*= maintenanceButtonPopup ===================================================*/
 #backupBookmarks {
-  --menuitem-image: url("chrome://devtools/skin/images/datastore.svg");
+  --menuitem-image: url("../icons/datastore.svg");
 }
 #fileRestoreMenu {
+  @include Option("userChrome.icon.menu.full") {
+    --menuitem-image: url("../icons/datarestore.svg");
+  }
 }
 
 #fileImport {
   --menuitem-image: url("../icons/toolbarButton-download.svg");
 }
 #fileExport {
-  --menuitem-image: url("chrome://browser/skin/open.svg");
+  --menuitem-image: url("../icons/toolbarButton-upload.svg");
 }
 
 #browserImport {
diff --git a/src/icons/context_menu/_downloads.scss b/src/icons/context_menu/_downloads.scss
index 957853d..4273633 100644
--- a/src/icons/context_menu/_downloads.scss
+++ b/src/icons/context_menu/_downloads.scss
@@ -9,7 +9,7 @@
   --menuitem-image: url("../icons/checkmark-circle.svg");
 }
 .downloadUseSystemDefaultMenuItem {
-  --menuitem-image: url("chrome://browser/skin/open.svg");
+  --menuitem-image: url("../icons/toolbarButton-upload.svg");
 }
 .downloadAlwaysUseSystemDefaultMenuItem {
   /* checkbox */