diff --git a/themes/classic/communicator/bookmarks/bookmarks.css b/themes/classic/communicator/bookmarks/bookmarks.css
index 844ba3402a53..3781f52f6dda 100644
--- a/themes/classic/communicator/bookmarks/bookmarks.css
+++ b/themes/classic/communicator/bookmarks/bookmarks.css
@@ -78,14 +78,26 @@
       -moz-binding        : url("chrome://global/skin/classicBindings.xml#toolbarbutton-left");
       border              : none;      
       vertical-align      : middle;
+    }
+    
+  .button-toolbar.bookmarkitem,
+  .button-toolbar.bookmarkfolder
+    {
       max-width           : 10em;
     }
     
-    .toolbarbutton-top-icon {
+  .button-toolbar.bookmarkfolder > box > text 
+    {
+      max-width: 8em  !important;
+    }
+    
+  .toolbarbutton-top-icon 
+    {
       max-width           : 2em;
     }
     
-    .toolbarbutton-left-text {
+  .toolbarbutton-left-text 
+    {
       max-width           : 8em;
     }
     
diff --git a/themes/modern/communicator/bookmarks/bookmarks.css b/themes/modern/communicator/bookmarks/bookmarks.css
index fbea231c40c4..c7f8950fe9ed 100644
--- a/themes/modern/communicator/bookmarks/bookmarks.css
+++ b/themes/modern/communicator/bookmarks/bookmarks.css
@@ -20,6 +20,7 @@
  * Contributor(s): 
  */
 
+    
 .bookmarkitem
   {
     list-style-image      : url("chrome://communicator/skin/bookmarks/bookmark-item.png");
@@ -36,6 +37,11 @@
     list-style-image      : url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.png");
   }
 
+.bookmarkfolder > box > text 
+  {
+    max-width: 8em;
+  }
+
 .bookmarkfolder[menuactive="true"]
   {
     list-style-image      : url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.png");