--- a/mail/themes/linux/mail/messenger.css
+++ b/mail/themes/linux/mail/messenger.css
@@ -145,28 +145,32 @@
     -moz-box-align: center;
   }
 
   /* Render titlebar command buttons according to system config.
    * Use full scale icons here as the Gtk+ does. */
   #titlebar-min {
     appearance: auto;
     -moz-default-appearance: -moz-window-button-minimize;
+    -moz-box-ordinal-group: env(-moz-gtk-csd-minimize-button-position);
   }
   #titlebar-max {
     appearance: auto;
     -moz-default-appearance: -moz-window-button-maximize;
+    -moz-box-ordinal-group: env(-moz-gtk-csd-maximize-button-position);
   }
   :root[sizemode="maximized"] #titlebar-max {
     appearance: auto;
     -moz-default-appearance: -moz-window-button-restore;
+    -moz-box-ordinal-group: env(-moz-gtk-csd-maximize-button-position);
   }
   #titlebar-close {
     appearance: auto;
     -moz-default-appearance: -moz-window-button-close;
+    -moz-box-ordinal-group: env(-moz-gtk-csd-close-button-position);
   }
 
   @media (-moz-gtk-csd-minimize-button: 0) {
     #titlebar-min {
       display: none;
     }
   }
   @media (-moz-gtk-csd-maximize-button: 0) {
@@ -187,17 +191,16 @@
 
     :root[tabsintitlebar] .titlebar-placeholder[type="caption-buttons"] {
       margin-inline-start: 10px;
     }
   }
 
   @media (-moz-gtk-csd-reversed-placement) {
     #titlebar-buttonbox-container,
-    #titlebar-close,
     .titlebar-placeholder[type="caption-buttons"] {
       -moz-box-ordinal-group: 0;
     }
 
     :root[tabsintitlebar] .titlebar-placeholder[type="caption-buttons"] {
       margin-inline-end: 10px;
     }
   }