diff --git a/xpfe/browser/resources/content/navigator.xul b/xpfe/browser/resources/content/navigator.xul
index 58430c805d69..5381731b9856 100644
--- a/xpfe/browser/resources/content/navigator.xul
+++ b/xpfe/browser/resources/content/navigator.xul
@@ -331,6 +331,10 @@ Contributor(s): ______________________________________. -->
 
   <toolbar id="nav-bar" class="decorated main-bar" chromeclass="toolbar" persist="collapsed">
 	<box align="horizontal" flex="100%" style="overflow: hidden">
+
+	<button class="large-toolbar left" id="back-button" crop="right" orient="vertical" observes="canGoBack"/>  
+	<button class="large-toolbar left" id="forward-button" crop="right" orient="vertical" observes="canGoForward"/>
+<!--
       <menubutton class="large-toolbar left" id="back-button" crop="right" orient="vertical" observes="canGoBack" oncommand="gotoHistoryIndex(event);">  
 	  <menupopup oncreate="BrowserBackMenu(event);">
 	  </menupopup>
@@ -339,6 +343,7 @@ Contributor(s): ______________________________________. -->
 	  <menupopup oncreate="BrowserForwardMenu(event);">
 	  </menupopup>
 	  </menubutton>
+-->	  
       <button class="large-toolbar left" id="reload-button" crop="right" orient="vertical" observes="canReload" />
       <button class="large-toolbar left" id="stop-button" crop="right" orient="vertical" onclick="BrowserStop()"/>
 
diff --git a/xpfe/browser/resources/content/navigatorOverlay.xul b/xpfe/browser/resources/content/navigatorOverlay.xul
index 32e3d4154ddd..f5dc20ae16a2 100644
--- a/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -121,8 +121,8 @@ Contributor(s): ______________________________________. -->
 	<broadcaster id="Browser:PrintPreview"  value="&printPreviewCmd.label;" disabled="true"  oncommand="BrowserReload();"/>
 	<broadcaster id="Browser:Print"  value="&printCmd.label;"        						 oncommand="BrowserPrint();"/>
   
-	<broadcaster id="canGoBack"	disabled="true" buttonaction="BrowserBack();"/>
-	<broadcaster id="canGoForward" disabled="true" buttonaction="BrowserForward();"/>
+	<broadcaster id="canGoBack"	disabled="true" oncommand="BrowserBack();"/>
+	<broadcaster id="canGoForward" disabled="true" oncommand="BrowserForward();"/>
 	<broadcaster id="Browser:Home" value="&goHomeCmd.label;" oncommand="BrowserHome();" />
   
 	<broadcaster id="Browser:Find"      value="&findOnCmd.label;"            oncommand="BrowserFind();" />