diff --git a/mozilla/themes/modern/communicator/MANIFEST b/mozilla/themes/modern/communicator/MANIFEST
index dde1ec79ba9..308ff9e4ef9 100644
--- a/mozilla/themes/modern/communicator/MANIFEST
+++ b/mozilla/themes/modern/communicator/MANIFEST
@@ -9,3 +9,6 @@ menubutton.css
 navbar-endbox.gif
 splitter.css
 toolbar.css
+menubuttonBindings.xml
+tb-menubutton-dm.gif
+tb-menubutton-dm-disabled.gif
diff --git a/mozilla/themes/modern/communicator/Makefile.in b/mozilla/themes/modern/communicator/Makefile.in
index a2fad35f8c9..c8e8d8148b5 100644
--- a/mozilla/themes/modern/communicator/Makefile.in
+++ b/mozilla/themes/modern/communicator/Makefile.in
@@ -35,10 +35,13 @@ EXPORT_RESOURCE = \
 		$(srcdir)/communicator.css \
 		$(srcdir)/formatting.css \
 		$(srcdir)/menu.css \
+		$(srcdir)/menubuttonBindings.xml \
 		$(srcdir)/menubutton.css \
 		$(srcdir)/splitter.css \
 		$(srcdir)/toolbar.css \
 		$(srcdir)/navbar-endbox.gif \
+		$(srcdir)/tb-menubutton-dm.gif \
+		$(srcdir)/tb-menubutton-dm-disabled.gif \
 		$(NULL)
 
 DIRS = search xpinstall sidebar bookmarks directory profile regviewer related wallet 
diff --git a/mozilla/themes/modern/communicator/makefile.win b/mozilla/themes/modern/communicator/makefile.win
index e16170ee02f..0db5a4d5782 100644
--- a/mozilla/themes/modern/communicator/makefile.win
+++ b/mozilla/themes/modern/communicator/makefile.win
@@ -29,6 +29,7 @@ include <$(THEME_ROOT_DEPTH)\theme.mk>
 
 install:: 
 	$(MAKE_INSTALL) box.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
+	$(MAKE_INSTALL) menubuttonBindings.xml $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
 	$(MAKE_INSTALL) brand.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
 	$(MAKE_INSTALL) button.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
 	$(MAKE_INSTALL) communicator.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
@@ -37,6 +38,8 @@ install::
 	$(MAKE_INSTALL) menubutton.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
 	$(MAKE_INSTALL) navbar-endbox.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
 	$(MAKE_INSTALL) splitter.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
+	$(MAKE_INSTALL) tb-menubutton-dm.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
+	$(MAKE_INSTALL) tb-menubutton-dm-disabled.gif $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
 	$(MAKE_INSTALL) toolbar.css $(DIST)\bin\chrome\skins\$(THEME)\communicator\skin
 
 clobber::
diff --git a/mozilla/themes/modern/communicator/menubutton.css b/mozilla/themes/modern/communicator/menubutton.css
index 09978f2d12c..5adc45c9925 100644
--- a/mozilla/themes/modern/communicator/menubutton.css
+++ b/mozilla/themes/modern/communicator/menubutton.css
@@ -52,4 +52,37 @@
      border-bottom          : 1px solid #CCCCCC;
    }
 
-   
\ No newline at end of file
+/** 
+ * Navigation bar style menubuttons 
+ **/
+.toolbar.menubutton-dual,
+.toolbar.menubutton-dual
+  {
+    border                  : none ! important;
+  }
+
+.button-toolbar-1.menubutton-dual-button
+  {
+    list-style-image        : inherit;
+  }
+
+.menubutton-dual-dropmarker
+  {
+    background              : transparent;
+    list-style-image        : url("chrome://communicator/skin/tb-menubutton-dm.gif");
+  } 
+
+.menubutton-dual-dropmarker[disabled="true"]
+  {
+    background              : transparent;
+    list-style-image        : url("chrome://communicator/skin/tb-menubutton-dm-disabled.gif");
+  } 
+  
+.menubutton-dual-dropmarker-box
+  {
+    margin-left             : 32px;
+    margin-bottom           : 1px;
+  }
+
+  
+  
\ No newline at end of file
diff --git a/mozilla/themes/modern/communicator/menubuttonBindings.xml b/mozilla/themes/modern/communicator/menubuttonBindings.xml
new file mode 100644
index 00000000000..d377b7a47e4
--- /dev/null
+++ b/mozilla/themes/modern/communicator/menubuttonBindings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+
+<bindings id="xulBindings"
+          xmlns="http://www.mozilla.org/xbl"
+          xmlns:html="http://www.w3.org/TR/REC-html40"
+          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+   
+  <binding id="menubutton-dual-foo">
+    <content excludes="observes,template,menupopup">
+      <xul:stack>
+        <xul:button class="menubutton-dual-button button-toolbar-1 top" allowevents="true" 
+                    inherits="buttontooltiptext:tooltiptext,buttonaction:oncommand,src,value,crop,accesskey,disabled"/>
+        <xul:box class="menubutton-dual-dropmarker-box" autostretch="never" valign="bottom" flex="1">
+          <xul:image class="menubutton-dual-dropmarker" inherits="disabled"/>
+        </xul:box>
+      </xul:stack>
+    </content>
+  </binding>
+  
+</bindings>
\ No newline at end of file
diff --git a/mozilla/themes/modern/communicator/tb-menubutton-dm-disabled.gif b/mozilla/themes/modern/communicator/tb-menubutton-dm-disabled.gif
new file mode 100644
index 00000000000..9109b11fd69
Binary files /dev/null and b/mozilla/themes/modern/communicator/tb-menubutton-dm-disabled.gif differ
diff --git a/mozilla/themes/modern/communicator/tb-menubutton-dm.gif b/mozilla/themes/modern/communicator/tb-menubutton-dm.gif
new file mode 100644
index 00000000000..060ccc51fbd
Binary files /dev/null and b/mozilla/themes/modern/communicator/tb-menubutton-dm.gif differ
diff --git a/mozilla/themes/modern/global/button32-bg-active.gif b/mozilla/themes/modern/global/button32-bg-active.gif
index b214d961dca..ee08f300826 100644
Binary files a/mozilla/themes/modern/global/button32-bg-active.gif and b/mozilla/themes/modern/global/button32-bg-active.gif differ
diff --git a/mozilla/themes/modern/global/button32-bg-disabled.gif b/mozilla/themes/modern/global/button32-bg-disabled.gif
index 6dfa1c7f511..b02f8109d90 100644
Binary files a/mozilla/themes/modern/global/button32-bg-disabled.gif and b/mozilla/themes/modern/global/button32-bg-disabled.gif differ
diff --git a/mozilla/themes/modern/global/button32-bg-hover.gif b/mozilla/themes/modern/global/button32-bg-hover.gif
index a8a6b782dc0..33e427a0e33 100644
Binary files a/mozilla/themes/modern/global/button32-bg-hover.gif and b/mozilla/themes/modern/global/button32-bg-hover.gif differ
diff --git a/mozilla/themes/modern/global/button32-bg.gif b/mozilla/themes/modern/global/button32-bg.gif
index 0b9936475b1..37507c7c86e 100644
Binary files a/mozilla/themes/modern/global/button32-bg.gif and b/mozilla/themes/modern/global/button32-bg.gif differ
diff --git a/mozilla/themes/modern/navigator/navigator.css b/mozilla/themes/modern/navigator/navigator.css
index c775fd122d8..3122099766a 100644
--- a/mozilla/themes/modern/navigator/navigator.css
+++ b/mozilla/themes/modern/navigator/navigator.css
@@ -43,12 +43,16 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
  */
 #back-button 
   {
+    behavior              : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-dual-foo");
 	  list-style-image      : url("chrome://navigator/skin/back.gif");
+    margin                : 0px;
   }
 
 #forward-button 
   {
+    behavior              : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-dual-foo");
 	  list-style-image      : url("chrome://navigator/skin/forward.gif");
+    margin                : 0px;
   }
 
 #stop-button 
@@ -116,4 +120,4 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
 .menuitem-iconic
   {
     padding               : 2px;
-  }
\ No newline at end of file
+  }
diff --git a/mozilla/xpfe/browser/resources/content/navigator.xul b/mozilla/xpfe/browser/resources/content/navigator.xul
index 2edc4e40668..24591793751 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.xul
+++ b/mozilla/xpfe/browser/resources/content/navigator.xul
@@ -221,18 +221,15 @@ Contributor(s): ______________________________________. -->
   
     <toolbar id="nav-bar" class="toolbar-primary chromeclass-toolbar" persist="collapsed" grippytooltiptext="&navigationBar.tooltip;">
       <box id="nav-bar-inner" autostretch="never" flex="1">
-	  <!--
-        <button class="button-toolbar-1 top" id="back-button" crop="right" observes="canGoBack"/>  
-    	  <button class="button-toolbar-1 top" id="forward-button" crop="right" observes="canGoForward"/>
-       -->
-        <menubutton class="menubutton-dual" id="back-button" crop="right" orient="vertical" observes="canGoBack" oncommand="gotoHistoryIndex(event);"
-                    value="&backButton.label;"
-                    buttontooltiptext="&backButton.tooltip;">  
+        <menubutton class="menubutton-dual toolbar" id="back-button" value="&backButton.label;" 
+                    crop="right" observes="canGoBack" oncommand="gotoHistoryIndex(event);"
+                    buttonaction="BrowserBack();" buttontooltiptext="&backButton.tooltip;">  
        	  <menupopup oncreate="BrowserBackMenu(event);"/>
     	  </menubutton>
-        <menubutton class="menubutton-dual" id="forward-button" crop="right" orient="vertical" observes="canGoForward" oncommand="gotoHistoryIndex(event);"
-                    value="&forwardButton.label;"
-                    buttontooltiptext="&forwardButton.tooltip;">  
+        <menubutton class="menubutton-dual toolbar" id="forward-button" 
+                    crop="right" orient="vertical" observes="canGoForward" 
+                    oncommand="gotoHistoryIndex(event);" buttonaction="BrowserForward();"
+                    value="&forwardButton.label;" buttontooltiptext="&forwardButton.tooltip;">  
       	  <menupopup oncreate="BrowserForwardMenu(event);"/>
     	  </menubutton>
         <button class="button-toolbar-1 top" id="reload-button" crop="right" observes="canReload" value="&reloadButton.label;" tooltiptext="&reloadButton.tooltip;"/>
@@ -240,26 +237,25 @@ Contributor(s): ______________________________________. -->
     
         <box class="box-toolbar-group" flex="1">
           <menubutton class="menubutton-icon button-toolbar-3" id="ubhist-keyword-popup" tooltiptext="&internetKeyword.tooltip;">
-           <menupopup class="button-toolbar-3" oncreate="CreateUBHistoryMenu(event);" oncommand="ExecuteUBCommand(event);">
-       <!--       <menuitem class="button-toolbar-3 menuitem-non-iconic" value="&quoteKeyword.label;" keyword="quote"/>
+            <menupopup class="button-toolbar-3" oncreate="CreateUBHistoryMenu(event);" oncommand="ExecuteUBCommand(event);">
+              <!--       
+              <menuitem class="button-toolbar-3 menuitem-non-iconic" value="&quoteKeyword.label;" keyword="quote"/>
               <menuitem class="button-toolbar-3 menuitem-non-iconic" value="&localKeyword.label;" keyword="local"/>
               <menuitem class="button-toolbar-3 menuitem-non-iconic" value="&shopKeyword.label;" keyword="shop"/>
               <menuitem class="button-toolbar-3 menuitem-non-iconic" value="&careerKeyword.label;" keyword="career"/>
               <menuitem class="button-toolbar-3 menuitem-non-iconic" value="&webmailKeyword.label;" keyword="webmail"/>
               <menuitem class="button-toolbar-3 menuitem-non-iconic" value="&listKeywords.label;" keyword="list"/>                 
-              <menuseparator/>  -->
+              <menuseparator/>  
+              -->
             </menupopup>
           </menubutton>
 
          
           <box autostretch="never" valign="middle" flex="1">
       			<image id="page-proxy-button" ondraggesture="DragProxyIcon(event);"/> 
-           <!--<textfield class="plain chromeclass-location" id="urlbar" flex="1"
-                       onkeypress="if( event.which == 13 ) { AddToUrlbarHistory(); BrowserLoadURL(); }"
-                       tooltiptext="&locationBar.tooltip;"/> -->
-			<textfield autocomplete="false" timeout="300" class="plain chromeclass-location" 
-		 	 searchSessionType="urlbar" id="urlbar" tooltiptext="&locationBar.tooltip;"
-			 onkeypress="if( event.which == 13 ) { AddToUrlbarHistory(); BrowserLoadURL(); }" flex="1"/>  
+			      <textfield autocomplete="false" timeout="300" class="plain chromeclass-location" 
+		 	                 searchSessionType="urlbar" id="urlbar" tooltiptext="&locationBar.tooltip;"
+			                 onkeypress="if( event.which == 13 ) { AddToUrlbarHistory(); BrowserLoadURL(); }" flex="1"/>  
             <button class="button-toolbar-3" id="search-button" value="&searchButton.label;" 
                     oncommand="OpenSearch('internet',false, document.getElementById('urlbar').value);" 
                     tooltiptext="&searchButton.tooltip;"/> 
@@ -272,7 +268,6 @@ Contributor(s): ______________________________________. -->
   		<button class="plain" id="navigator-throbber" oncommand="goClickThrobber('browser.throbber.url')" tooltiptext="&throbber.tooltip;"/>
     </toolbar>
   
-  
     <toolbar id="PersonalToolbar" class="chromeclass-directories" persist="collapsed" dragdroparea="innermostBox"
              ondraggesture="return BeginDragPersonalToolbar(event);"
              ondragdrop="return DropPersonalToolbar(event);"