diff --git a/mozilla/themes/classic/global/mac/box.css b/mozilla/themes/classic/global/mac/box.css
index 7dabc0b0934..477df7676dc 100644
--- a/mozilla/themes/classic/global/mac/box.css
+++ b/mozilla/themes/classic/global/mac/box.css
@@ -12,14 +12,13 @@ title
     padding-right         : 40px;
   }
 
-/* This just SUCKS, but seems to be necessitated by titledbox design... */
-title > *
+box.titledbox-title 
   {
-    margin-left           : 5px;
-    margin-right          : 5px;
-  }
+    padding-left           : 5px;
+    padding-right          : 5px;     
+  } 
 
-:titledbox-content 
+box.titledbox-body
   {
     display               : block;
     padding               : inherit;
diff --git a/mozilla/themes/classic/global/unix/box.css b/mozilla/themes/classic/global/unix/box.css
index ee989d0202b..123a7663ff4 100644
--- a/mozilla/themes/classic/global/unix/box.css
+++ b/mozilla/themes/classic/global/unix/box.css
@@ -12,14 +12,13 @@ title
     padding-right         : 40px;
   }
 
-/* This just SUCKS, but seems to be necessitated by titledbox design... */
-title > *
+box.titledbox-title 
   {
-    margin-left           : 5px;
-    margin-right          : 5px;
-  }
+    padding-left           : 5px;
+    padding-right          : 5px;     
+  } 
 
-:titledbox-content 
+box.titledbox-body
   {
     display               : block;
     padding               : inherit;
diff --git a/mozilla/themes/classic/global/win/box.css b/mozilla/themes/classic/global/win/box.css
index ee989d0202b..84900b6dc01 100644
--- a/mozilla/themes/classic/global/win/box.css
+++ b/mozilla/themes/classic/global/win/box.css
@@ -12,19 +12,19 @@ title
     padding-right         : 40px;
   }
 
-/* This just SUCKS, but seems to be necessitated by titledbox design... */
-title > *
+box.titledbox-title 
   {
-    margin-left           : 5px;
-    margin-right          : 5px;
-  }
+    padding-left           : 5px;
+    padding-right          : 5px;     
+  } 
 
-:titledbox-content 
+box.titledbox-body
   {
     display               : block;
     padding               : inherit;
   }
 
+
     
 /** box formatting **/
   box[autostretch="never"]
diff --git a/mozilla/themes/modern/global/box.css b/mozilla/themes/modern/global/box.css
index 7dabc0b0934..477df7676dc 100644
--- a/mozilla/themes/modern/global/box.css
+++ b/mozilla/themes/modern/global/box.css
@@ -12,14 +12,13 @@ title
     padding-right         : 40px;
   }
 
-/* This just SUCKS, but seems to be necessitated by titledbox design... */
-title > *
+box.titledbox-title 
   {
-    margin-left           : 5px;
-    margin-right          : 5px;
-  }
+    padding-left           : 5px;
+    padding-right          : 5px;     
+  } 
 
-:titledbox-content 
+box.titledbox-body
   {
     display               : block;
     padding               : inherit;