diff --git a/mozilla/themes/modern/communicator/brand.css b/mozilla/themes/modern/communicator/brand.css
index bf90edc3802..9c53e5b4ff1 100644
--- a/mozilla/themes/modern/communicator/brand.css
+++ b/mozilla/themes/modern/communicator/brand.css
@@ -3,7 +3,7 @@
   {
     -moz-binding          : url("chrome://global/content/xulBindings.xml#buttontop");
     list-style-image      : url("chrome://global/skin/animthrob_single.gif");
-    margin                : 5px 11px 6px 8px;
+    margin                : 5px 1px 9px 8px;
     padding               : 0px;
     cursor                : pointer;
     border                : 0px;
@@ -17,7 +17,7 @@
   
 #navigator-throbber:hover:active
   {
-    margin               : 6px 10px 5px 9px;
+    margin               : 4px 0px 5px 9px;
   }
 
 #navigator-throbber > .button-internal-box
diff --git a/mozilla/themes/modern/communicator/button.css b/mozilla/themes/modern/communicator/button.css
index c3d3d5c88c2..04438122dbc 100644
--- a/mozilla/themes/modern/communicator/button.css
+++ b/mozilla/themes/modern/communicator/button.css
@@ -207,7 +207,7 @@
       font-weight           : bold;
       background-color      : transparent;
       border				: 0px;
-      margin				: 2px 7px 2px 0px;
+      margin				: 3px 7px 2px 0px;
       color					: #2F405D;
     }
 
diff --git a/mozilla/themes/modern/communicator/toolbar.css b/mozilla/themes/modern/communicator/toolbar.css
index 1324ff4018c..0d3afb10ff5 100644
--- a/mozilla/themes/modern/communicator/toolbar.css
+++ b/mozilla/themes/modern/communicator/toolbar.css
@@ -81,22 +81,22 @@ toolbar[collapsed="true"] > toolbargrippy
   
 .toolbar-primary-image-left
   {
-    list-style-image      : url("chrome://global/skin/navbar-bg-leftcap.gif");
+	background            : url("chrome://global/skin/navbar-bg-leftcap.gif") no-repeat;
     width				  : 24px;
-    height				  : 43px;
+    height				  : 46px;
   }
 
 .toolbar-primary-image-middle
   {
-    list-style-image          : url("chrome://global/skin/navbar-bg.gif");
-    height			  	  : 43px;
+	background            : url("chrome://global/skin/navbar-bg.gif") repeat-x;
+    height			  	  : 46px;
   }
 
 .toolbar-primary-image-right
   {
-  	list-style-image	  : url("chrome://global/skin/navbar-bg-rightcap.gif");
+	background            : url("chrome://global/skin/navbar-bg-rightcap.gif") no-repeat;
   	width				  : 24px;
-  	height				  : 43px;
+  	height				  : 46px;
   }
 
 .toolbary-primary-grippy
diff --git a/mozilla/themes/modern/global/globalBindings.xml b/mozilla/themes/modern/global/globalBindings.xml
index cc80327a4df..cf46cf7e6b7 100644
--- a/mozilla/themes/modern/global/globalBindings.xml
+++ b/mozilla/themes/modern/global/globalBindings.xml
@@ -29,63 +29,41 @@
   
   <binding id="toolbar-primary" extends="chrome://global/content/toolbarBindings.xml#toolbar">
   	<content>
-  		<xul:stack flex="1">
-  			<xul:box flex="1">
-  				<xul:image class="toolbar-primary-image-left"/>
-    			<xul:image flex="1" class="toolbar-primary-image-middle"/>
-    			<xul:image class="toolbar-primary-image-right"/>
-    		</xul:box>
-    	    <xul:box flex="1">
-    	    	<xul:toolbargrippy inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar"
-           		                onclick="this.grippyClicked();" tbattr="toolbar-grippy"
-            	                class="toolbar-primary-grippy"/>
-    	    	<xul:box flex="1" class="toolbar-holder" inherits="collapsed,last-toolbar,orient=tborient,autostretch=tbautostretch" autostretch="never">
-    	    	  <children/>
-    	    	</xul:box>
-    	    </xul:box>
-    	</xul:stack>
-    </content>
+		<xul:box class="toolbar-primary-image-left">
+			<xul:toolbargrippy inherits="tooltiptext=grippytooltiptext,tooltip=grippytooltip,last-toolbar"
+					onclick="this.grippyClicked();" tbattr="toolbar-grippy" class="toolbar-primary-grippy"/>
+		</xul:box> 
+		<xul:box flex="1" class="toolbar-primary-image-middle toolbar-holder" 
+			inherits="collapsed,last-toolbar,orient=tborient,autostretch=tbautostretch" autostretch="never">
+			<children/>
+		</xul:box>
+		<xul:spring class="toolbar-primary-image-right"/>
+	</content>
   </binding>
-  
+	  
   <binding id="nav-bar-inner" extends="xul:box">
     <content>
-    	<xul:box orient="vertical">
-    		<xul:spring class="navbar-inner-groove-image-left-top"/>
-    		<xul:spring flex="1" class="navbar-inner-groove-image-left-middle"/>
-    		<xul:spring class="navbar-inner-groove-image-left-bottom"/>
-    	</xul:box>
- 		<xul:box flex="1" class="navbar-inner-border-outer">
+    	<xul:image class="navbar-inner-groove-image-left"/>
+		<xul:box flex="1" class="navbar-inner-border-outer">
  			<xul:box flex="1" class="navbar-inner-border-middle">
  				<xul:box flex="1" class="navbar-inner-border-inner">
 			    	<children/>
 	    		</xul:box>
 	    	</xul:box>
-	    </xul:box>
-	    <xul:box orient="vertical">
-    		<xul:spring class="navbar-inner-groove-image-right-top"/>
-    		<xul:spring flex="1" class="navbar-inner-groove-image-right-middle"/>
-    		<xul:spring class="navbar-inner-groove-image-right-bottom"/>
-    	</xul:box>
+		</xul:box>
+		<xul:image class="navbar-inner-groove-image-right"/>
     </content>
   </binding>
   
   <binding id="urlbar-group" extends="xul:box">
     <content>
-		<xul:box orient="vertical">
-    		<xul:spring class="urlbar-image-left-top"/>
-    		<xul:spring flex="1" class="urlbar-image-left-middle"/>
-    		<xul:spring class="urlbar-image-left-bottom"/>
-    	</xul:box> 		
-    	<xul:box flex="1" class="urlbar-border-outer">
- 			<xul:box flex="1" class="urlbar-border-inner">
+    	<xul:image class="urlbar-image-left"/>
+		<xul:box flex="1" class="urlbar-border-outer">
+			<xul:box flex="1" class="urlbar-border-inner">
 		    	<children/>
 	    	</xul:box>
 	    </xul:box>
-		<xul:box orient="vertical">
-    		<xul:spring class="urlbar-image-right-top"/>
-    		<xul:spring flex="1" class="urlbar-image-right-middle"/>
-    		<xul:spring class="urlbar-image-right-bottom"/>
-    	</xul:box> 		
+		<xul:image class="urlbar-image-right"/>
     </content>
   </binding>
 
diff --git a/mozilla/themes/modern/jar.mn b/mozilla/themes/modern/jar.mn
index dcc37635744..e098284e5ea 100644
--- a/mozilla/themes/modern/jar.mn
+++ b/mozilla/themes/modern/jar.mn
@@ -358,20 +358,6 @@ skins/modern.jar:
     navigator/skin/urlbar-left.gif							   (navigator/urlbar-left.gif)
     navigator/skin/urlbar-middle.gif						   (navigator/urlbar-middle.gif)
     navigator/skin/urlbar-right.gif							   (navigator/urlbar-right.gif)
-    navigator/skin/navbar-groove-left-bottom.gif			   (navigator/navbar-groove-left-bottom.gif)
-    navigator/skin/navbar-groove-left-middle.gif		       (navigator/navbar-groove-left-middle.gif)
-    navigator/skin/navbar-groove-left-top.gif				   (navigator/navbar-groove-left-top.gif)
-    navigator/skin/navbar-groove-middle-bottom.gif			   (navigator/navbar-groove-middle-bottom.gif)
-    navigator/skin/navbar-groove-middle-top.gif				   (navigator/navbar-groove-middle-top.gif)
-    navigator/skin/navbar-groove-right-bottom.gif			   (navigator/navbar-groove-right-bottom.gif)
-    navigator/skin/navbar-groove-right-middle.gif			   (navigator/navbar-groove-right-middle.gif)
-    navigator/skin/navbar-groove-right-top.gif				   (navigator/navbar-groove-right-top.gif)
-    navigator/skin/urlbar-left-bottom.gif					   (navigator/urlbar-left-bottom.gif)
-    navigator/skin/urlbar-left-middle.gif					   (navigator/urlbar-left-middle.gif)
-    navigator/skin/urlbar-left-top.gif						   (navigator/urlbar-left-top.gif)
-    navigator/skin/urlbar-right-bottom.gif					   (navigator/urlbar-right-bottom.gif)
-    navigator/skin/urlbar-right-middle.gif					   (navigator/urlbar-right-middle.gif)
-    navigator/skin/urlbar-right-top.gif						   (navigator/urlbar-right-top.gif)
     communicator/skin/bookmarks/bookmark-folder-closed-sel.gif (communicator/bookmarks/bookmark-folder-closed-sel.gif)
     communicator/skin/bookmarks/bookmark-folder-closed.gif     (communicator/bookmarks/bookmark-folder-closed.gif)
     communicator/skin/bookmarks/bookmark-folder-open-sel.gif   (communicator/bookmarks/bookmark-folder-open-sel.gif)
diff --git a/mozilla/themes/modern/navigator/MANIFEST b/mozilla/themes/modern/navigator/MANIFEST
index 60ef850cd53..24c36cf68ba 100644
--- a/mozilla/themes/modern/navigator/MANIFEST
+++ b/mozilla/themes/modern/navigator/MANIFEST
@@ -35,17 +35,3 @@ ubhist-keyword-popup.gif
 urlbar-left.gif
 urlbar-middle.gif
 urlbar-right.gif
-navbar-groove-left-bottom.gif
-navbar-groove-left-middle.gif
-navbar-groove-left-top.gif
-navbar-groove-middle-bottom.gif
-navbar-groove-middle-top.gif
-navbar-groove-right-bottom.gif
-navbar-groove-right-middle.gif
-navbar-groove-right-top.gif
-urlbar-left-bottom.gif
-urlbar-left-middle.gif
-urlbar-left-top.gif
-urlbar-right-bottom.gif
-urlbar-right-middle.gif
-urlbar-right-top.gif
diff --git a/mozilla/themes/modern/navigator/Makefile.in b/mozilla/themes/modern/navigator/Makefile.in
index 7d25a5be537..b37bf132fe6 100644
--- a/mozilla/themes/modern/navigator/Makefile.in
+++ b/mozilla/themes/modern/navigator/Makefile.in
@@ -67,20 +67,6 @@ EXPORT_RESOURCE_SAMPLES = \
 	urlbar-left.gif \
 	urlbar-middle.gif \
 	urlbar-right.gif \
-	navbar-groove-left-bottom.gif \
-	navbar-groove-left-middle.gif \
-	navbar-groove-left-top.gif \
-	navbar-groove-middle-bottom.gif \
-	navbar-groove-middle-top.gif \
-	navbar-groove-right-bottom.gif \
-	navbar-groove-right-middle.gif \
-	navbar-groove-right-top.gif \
-	urlbar-left-bottom.gif \
-	urlbar-left-middle.gif \
-	urlbar-left-top.gif \
-	urlbar-right-bottom.gif \
-	urlbar-right-middle.gif \
-	urlbar-right-top.gif \
     $(NULL)
 
 include $(topsrcdir)/config/rules.mk
diff --git a/mozilla/themes/modern/navigator/makefile.win b/mozilla/themes/modern/navigator/makefile.win
index addcc87f1bc..3a91d2d4847 100644
--- a/mozilla/themes/modern/navigator/makefile.win
+++ b/mozilla/themes/modern/navigator/makefile.win
@@ -65,17 +65,3 @@ install::
 	$(MAKE_INSTALL) urlbar-left.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
 	$(MAKE_INSTALL) urlbar-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
 	$(MAKE_INSTALL) urlbar-right.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
-	$(MAKE_INSTALL) navbar-groove-left-bottom.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
-	$(MAKE_INSTALL) navbar-groove-left-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
-	$(MAKE_INSTALL) navbar-groove-left-top.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
-	$(MAKE_INSTALL) navbar-groove-middle-bottom.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
-	$(MAKE_INSTALL) navbar-groove-middle-top.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
-	$(MAKE_INSTALL) navbar-groove-right-bottom.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
-	$(MAKE_INSTALL) navbar-groove-right-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
-	$(MAKE_INSTALL) navbar-groove-right-top.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
-	$(MAKE_INSTALL) urlbar-left-bottom.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
-	$(MAKE_INSTALL) urlbar-left-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
-	$(MAKE_INSTALL) urlbar-left-top.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
-	$(MAKE_INSTALL) urlbar-right-bottom.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
-	$(MAKE_INSTALL) urlbar-right-middle.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
-	$(MAKE_INSTALL) urlbar-right-top.gif $(DIST)\bin\chrome\skins\$(THEME)\navigator\skin
diff --git a/mozilla/themes/modern/navigator/navigator.css b/mozilla/themes/modern/navigator/navigator.css
index 37c87d03fdd..74c4528b921 100644
--- a/mozilla/themes/modern/navigator/navigator.css
+++ b/mozilla/themes/modern/navigator/navigator.css
@@ -140,7 +140,7 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
   {
     -moz-binding          : url("chrome://communicator/skin/menubuttonBindings.xml#menubutton-dual-foo");
     list-style-image	  : url("chrome://global/skin/print.gif");
-	margin				  : 6px 6px 6px 6px;
+	margin                : 6px 6px 10px 6px;
   }
 
 #print-button[disabled="true"],
@@ -179,51 +179,23 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
 
 /*all the urlbar stuff*/
 
+#nav-bar > .toolbar-primary-image-left, #nav-bar > .toolbar-primary-image-middle, #nav-bar > .toolbar-primary-image-right
+{
+	max-height	: 43px;
+}
+
 #nav-bar-inner
   {
   	-moz-binding		  : url("chrome://global/skin/globalBindings.xml#nav-bar-inner");
-	margin				  : 6px 0px 6px 6px;
+	margin				  : 6px 0px 9px 6px;
     min-width			  : 0px;
   }
 
-.navbar-inner-groove-image-left-top
-  {
-  	background			  : url("chrome://navigator/skin/navbar-groove-left-top.gif") no-repeat;
-  	height				  : 15px;
-  	width				  : 6px; 
-  }
-
-.navbar-inner-groove-image-left-middle
-  {
-  	background			  : url("chrome://navigator/skin/navbar-groove-left-middle.gif") repeat-y;
-  	width				  : 6px;
-  }
-
-.navbar-inner-groove-image-left-bottom
-  {
-  	background			  : url("chrome://navigator/skin/navbar-groove-left-bottom.gif") no-repeat;
-  	height				  : 15px;
-  	width				  : 6px; 
-  }
-
-.navbar-inner-groove-image-right-top
-  {
-  	background			  : url("chrome://navigator/skin/navbar-groove-right-top.gif") no-repeat;
-  	height				  : 15px;
-  	width				  : 6px; 
-  }
-
-.navbar-inner-groove-image-right-middle
-  {
-  	background			  : url("chrome://navigator/skin/navbar-groove-right-middle.gif") repeat-y;
-  	width				  : 6px;
-  }
-
-.navbar-inner-groove-image-right-bottom
-  {
-  	background			  : url("chrome://navigator/skin/navbar-groove-right-bottom.gif") no-repeat;
-  	height				  : 15px;
-  	width				  : 6px; 
+.navbar-inner-groove-image-left                                                 
+  {                                                                             
+	list-style-image          : url("chrome://navigator/skin/navbar-inner-groove-left.gif");
+	width                             : 6px;                                
+	height                            : 31px;
   }
 
 /* 3px border on top and bottom of navbar-inner */
@@ -246,50 +218,25 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
   	border-bottom		  : 1px solid #556D8B;
   }
 
+.navbar-inner-groove-image-right                                                
+  {                                                                             
+	list-style-image          : url("chrome://navigator/skin/navbar-inner-groove-right.gif");
+	width                     : 6px;                                
+	height                    : 31px;                               
+  }
+
+
 #urlbar-group
   {
   	-moz-binding		  : url("chrome://global/skin/globalBindings.xml#urlbar-group");
   	margin				  : 3px 8px 4px 2px;
   }
 
-.urlbar-image-left-top
+.urlbar-image-left
   {
-  	background			  : url("chrome://navigator/skin/urlbar-left-top.gif") no-repeat;
-  	width				  : 3px;
-  	height				  : 4px;
-  }
-
-.urlbar-image-left-middle
-  {
-  	background			  : url("chrome://navigator/skin/urlbar-left-middle.gif") repeat-y;
-  	width				  : 3px;
-  }
-
-.urlbar-image-left-bottom
-  {
-  	background			  : url("chrome://navigator/skin/urlbar-left-bottom.gif") no-repeat;
-  	width				  : 3px;
-  	height				  : 4px;
-  }
-
-.urlbar-image-right-top
-  {
-  	background			  : url("chrome://navigator/skin/urlbar-right-top.gif") no-repeat;
-  	width				  : 4px;
-  	height				  : 8px;
-  }
-
-.urlbar-image-right-middle
-  {
-  	background			  : url("chrome://navigator/skin/urlbar-right-middle.gif") repeat-y;
-  	width				  : 4px;
-  }
-
-.urlbar-image-right-bottom
-  {
-  	background			  : url("chrome://navigator/skin/urlbar-right-bottom.gif") no-repeat;
-  	width				  : 4px;
-  	height				  : 9px;
+  	list-style-image          : url("chrome://navigator/skin/urlbar-left.gif");
+  	width                     : 3px;
+  	height                    : 18px;
   }
 
 .urlbar-border-outer
@@ -301,7 +248,15 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
   {
   	border-top			  : 1px solid #A3A3A3;
   }
-  
+
+.urlbar-image-right                                                             
+  {                                                                             
+	list-style-image          : url("chrome://navigator/skin/urlbar-right.gif");
+	width                             : 4px;                                
+	height                            : 18px;                               
+  }
+
+
 #page-proxy-button 
   {
   	margin-left			  : 0px;
@@ -320,7 +275,7 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
 
 #ubhist-keyword-popup
   {
-    margin                : 2px 4px 9px 3px;
+    margin                : 3px 4px 8px 3px;
     width                 : 10px; 
     list-style-image      : url("chrome://navigator/skin/ubhist-keyword-popup.gif");
     background-color	  : transparent;
@@ -334,7 +289,7 @@ window[chromehidden~="extrachrome"] .chromeclass-extrachrome {
 
 #ubhist-keyword-popup:hover:active
   {
-    margin                : 2px 4px 9px 3px;
+    margin                : 3px 4px 8px 3px;
     width                 : 10px; 
     list-style-image      : url("chrome://navigator/skin/ubhist-keyword-popup-active.gif"); 
   }