diff --git a/userChrome.css b/userChrome.css
index 37a653c..41f5849 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -886,6 +886,47 @@
   }
 
   /** Context Menu - Icons ****************************************************/
+  /*= Layout =================================================================*/
+  menupopup menuitem,
+  menupopup menu {
+    -moz-appearance: none !important;  /* Linux: menulist */
+  }
+
+  /* Icon */
+  :not(menu, #ContentSelectDropdown) > menupopup > menuitem:not(.menuitem-iconic, [type="checkbox"], .in-menulist),
+  :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, [type="checkbox"], .in-menulist),
+  #blockedPopupDontShowMessage {
+    -moz-context-properties: fill, fill-opacity !important;
+    fill: currentColor !important;
+    background-size: 16px !important;
+    background-repeat: no-repeat !important;
+  }
+
+  /* Layout */
+  :root {
+    --context-menu-background-padding-default: 5px;
+    --context-menu-background-padding: var(--context-menu-background-padding-default);
+  }
+  :not(menu, #ContentSelectDropdown) > menupopup > menuitem,
+  :not(menu, #ContentSelectDropdown) > menupopup > menu,
+  #blockedPopupDontShowMessage {
+    background-position: left var(--context-menu-background-padding) center !important;
+    padding-inline-start: var(--context-menu-background-padding) !important;
+  }
+
+  @media (-moz-os-version: windows-win7 ),
+         (-moz-os-version: windows-win8 ),
+         (-moz-os-version: windows-win10) {
+    :not(menu, #ContentSelectDropdown) > menupopup > menuitem:not(.menuitem-iconic, [type="checkbox"], .in-menulist),
+    :not(menu, #ContentSelectDropdown) > menupopup > menu:not(.menu-iconic, [type="checkbox"], .in-menulist),
+    :root {
+      --context-menu-background-padding: 1em;
+    }
+    #blockedPopupDontShowMessage {
+      padding-inline-start: calc(var(--context-menu-background-padding) + var(--menu-padding) + var(--context-menu-background-padding-default) + 16px) !important;
+    }
+  }
+
   /*= tabContextMenu =========================================================*/
   #context_openANewTab {
     background-image: url(chrome://browser/skin/new-tab.svg) !important;