diff --git a/css/leptonChrome.css b/css/leptonChrome.css
index 6ce5001..ec9aa94 100644
--- a/css/leptonChrome.css
+++ b/css/leptonChrome.css
@@ -250,9 +250,6 @@
       color: inherit !important; /* Original: -moz-menubarhovertext */
       background-color: color-mix(in srgb, currentColor 20%, transparent) !important; /* Original: -moz-menuhover */
     }
-    /*= Linux - Titlebar button at lwtheme =====================================*/
-    @media not -moz-pref("userChrome.compatibility.os.linux_non_native_titlebar_button") {
-    }
   }
   /*= Linux - Light System Default Theme's Selected Tab ========================*/
   @media (-moz-gtk-csd-available) and (prefers-color-scheme: light) {
@@ -12202,6 +12199,17 @@
       #main-menubar > menu menupopup {
         --menuitem-image: none; /* Prevent Image Inheritance */
       }
+      @media (-moz-platform: windows) {
+        #main-menubar > menu > :is(.menubar-text, .menu-text) {
+          transform: translateY(-1px) !important; /* Fix menu top padding position */
+          padding-inline-start: 0.3em !important;
+        }
+      }
+      @media (-moz-gtk-csd-available) {
+        #main-menubar > menu > :is(.menubar-text, .menu-text) {
+          padding-inline-start: 3px;
+        }
+      }
       @media not -moz-pref("userChrome.padding.global_menubar") {
         #main-menubar > menu {
           padding-block: 2px !important;
@@ -12369,9 +12377,6 @@
         --context-menu-background-padding-default: 6px;
         --context-menu-text-padding: 21px;
       }
-      #main-menubar > menu > :is(.menubar-text, .menu-text) {
-        padding-inline-start: 3px;
-      }
     }
     /* Padding - Mac */
     @media -moz-pref("layout.css.osx-font-smoothing.enabled") {
@@ -14398,7 +14403,6 @@
     color: inherit !important; /* Original: -moz-menubarhovertext */
     background-color: color-mix(in srgb, currentColor 20%, transparent) !important; /* Original: -moz-menuhover */
   }
-  /*= Linux - Titlebar button at lwtheme =====================================*/
 }
 @media (-moz-bool-pref: "userChrome.compatibility.os") and (-moz-gtk-csd-available) and (prefers-color-scheme: light) {
   /* Because of
@@ -27735,6 +27739,17 @@
     --menuitem-image: none; /* Prevent Image Inheritance */
   }
 }
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menubar") and (-moz-platform: windows) {
+  #main-menubar > menu > :is(.menubar-text, .menu-text) {
+    transform: translateY(-1px) !important; /* Fix menu top padding position */
+    padding-inline-start: 0.3em !important;
+  }
+}
+@media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menubar") and (-moz-gtk-csd-available) {
+  #main-menubar > menu > :is(.menubar-text, .menu-text) {
+    padding-inline-start: 3px;
+  }
+}
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "userChrome.icon.global_menubar") and (not (-moz-bool-pref: "userChrome.padding.global_menubar")) {
   #main-menubar > menu {
     padding-block: 2px !important;
@@ -27889,9 +27904,6 @@
     --context-menu-background-padding-default: 6px;
     --context-menu-text-padding: 21px;
   }
-  #main-menubar > menu > :is(.menubar-text, .menu-text) {
-    padding-inline-start: 3px;
-  }
 }
 @media (not (-moz-bool-pref: "userChrome.icon.disabled")) and (-moz-bool-pref: "userChrome.icon.menu") and (-moz-bool-pref: "layout.css.osx-font-smoothing.enabled") {
   :root {
diff --git a/css/leptonChromeESR.css b/css/leptonChromeESR.css
index 09e4499..41c54de 100644
--- a/css/leptonChromeESR.css
+++ b/css/leptonChromeESR.css
@@ -379,7 +379,6 @@
       color: inherit !important; /* Original: -moz-menubarhovertext */
       background-color: color-mix(in srgb, currentColor 20%, transparent) !important; /* Original: -moz-menuhover */
     }
-    /*= Linux - Titlebar button at lwtheme =====================================*/
   }
   /*= Linux - Light System Default Theme's Selected Tab ========================*/
   @media (-moz-gtk-csd-available) and (-moz-toolbar-prefers-color-scheme: light),
@@ -12682,6 +12681,20 @@
       #main-menubar > menu menupopup {
         --menuitem-image: none; /* Prevent Image Inheritance */
       }
+      @media (-moz-os-version: windows-win7),
+        (-moz-os-version: windows-win8),
+        (-moz-os-version: windows-win10),
+        (-moz-platform: windows) {
+        #main-menubar > menu > :is(.menubar-text, .menu-text) {
+          transform: translateY(-1px) !important; /* Fix menu top padding position */
+          padding-inline-start: 0.3em !important;
+        }
+      }
+      @media (-moz-gtk-csd-available) {
+        #main-menubar > menu > :is(.menubar-text, .menu-text) {
+          padding-inline-start: 3px;
+        }
+      }
       @supports not -moz-bool-pref("userChrome.padding.global_menubar") {
         #main-menubar > menu {
           padding-block: 2px !important;
@@ -13030,9 +13043,6 @@
         --context-menu-background-padding-default: 6px;
         --context-menu-text-padding: 21px;
       }
-      #main-menubar > menu > :is(.menubar-text, .menu-text) {
-        padding-inline-start: 3px;
-      }
     }
     /* Padding - Mac */
     @supports -moz-bool-pref("layout.css.osx-font-smoothing.enabled") {
diff --git a/src/icons/layout/_menu.scss b/src/icons/layout/_menu.scss
index 3d8ac85..64e5867 100644
--- a/src/icons/layout/_menu.scss
+++ b/src/icons/layout/_menu.scss
@@ -81,6 +81,15 @@ $_layoutCommonMenus: (
     menupopup {
       --menuitem-image: none; /* Prevent Image Inheritance */
     }
+    & > :is(.menubar-text, .menu-text) {
+      @include OS($win) {
+        transform: translateY(-1px) !important; /* Fix menu top padding position */
+        padding-inline-start: 0.3em !important;
+      }
+      @include OS($linux) {
+        @include _layout_init_linux;
+      }
+    }
     @include NotOption("userChrome.padding.global_menubar") {
       padding-block: 2px !important;
     }
@@ -113,10 +122,6 @@ $_layoutCommonMenus: (
 /* Padding - Linux */
 @include OS($linux) {
   @include _layout_root_linux;
-
-  #{$_globalMenus} > :is(.menubar-text, .menu-text) {
-    @include _layout_init_linux;
-  }
 }
 
 /* Padding - Mac */