Tweaking Firefox 4's orange buttom

Question

I'm working in my version of a solution to remove the ugly orange buttom in Firefox 4 Aero, I think it works very well, except with this configuration:

Menu Bar: Off; Navigation Toolbar: Off; Bookmarks Toolbar: On; Tabs on Top: Off.

It hides the window buttons because I collapse the formerly orange button when tabs are not on top. It's no big deal, but I'd like to know if there is a way to fix this.

I could be fixed with a selector that combines these:

 #toolbar-menubar[autohide="true"]
 #nav-bar[collapsed="true"]
 #main-window[tabsontop="false"] OR #navigator-toolbox[tabsontop="false"]
 #appmenu-button-container {
  display: block !important;
 }

Of course if I'll be glad if you present another solution, because that one eluded me. Anyway, you can try this customization, it looks really good.

profiles\user\chrome\userChrome.css

#main-window[tabsontop="true"] > #appmenu-button-container {
 position: fixed !important;
}

#main-window[tabsontop="false"] > #appmenu-button-container {
 display: none !important;
}

#appmenu-button {
 background-color: rgba(54, 121, 166, 0.2) !important;
 padding: 3px 18px 3px 18px !important;
 margin-left: 2px !important;
}

#navigator-toolbox[tabsontop="false"] > #toolbar-menubar[autohide="true"] ~ #nav-bar {
 padding-right: 120px !important;
}

#navigator-toolbox[tabsontop="true"] > #toolbar-menubar[autohide="true"] ~ #TabsToolbar {
 padding-left: 105px !important;
 padding-right: 120px !important;
}

#navigator-toolbox[tabsontop="false"] > #toolbar-menubar[autohide="true"] ~ #nav-bar[collapsed="true"] ~ toolbar[collapsed="true"] ~ #TabsToolbar {
 padding-right: 120px !important;
}