diff --git a/mozilla/calendar/resources/content/unifinder/unifinder.js b/mozilla/calendar/resources/content/unifinder/unifinder.js
index bee98147f2b..0ecbc9666ad 100644
--- a/mozilla/calendar/resources/content/unifinder/unifinder.js
+++ b/mozilla/calendar/resources/content/unifinder/unifinder.js
@@ -560,7 +560,7 @@ function refreshEventTree( eventArray, childrenName )
       ** HACK! 
       ** There is a mysterious child of the HBox, with a flex of one, so set the flex on the HBox really high to hide the child. 
       */
-      treeCellHBox.setAttribute( "flex" , "1000" );
+      treeCellHBox.setAttribute( "flex" , "1" );
       treeCellHBox.setAttribute( "class", "unifinder-treecell-box-class" );
       treeCellHBox.setAttribute( "crop", "right" );
       treeCellHBox.setAttribute( "align", "center" );
diff --git a/mozilla/calendar/resources/jar.mn b/mozilla/calendar/resources/jar.mn
index 7707cd030e3..66edb87a879 100644
--- a/mozilla/calendar/resources/jar.mn
+++ b/mozilla/calendar/resources/jar.mn
@@ -157,10 +157,6 @@ calendar.jar:
     skin/modern/calendar/unifinder/newcategory_hover.png (skin/modern/unifinder/newcategory_hover.png)
     skin/modern/calendar/unifinder/newcategory_up.png (skin/modern/unifinder/newcategory_up.png)
     skin/modern/calendar/unifinder/open_folder.png (skin/modern/unifinder/open_folder.png)
-    skin/modern/calendar/unifinder/options_button.png (skin/modern/unifinder/options_button.png)
-    skin/modern/calendar/unifinder/options_button_down.png (skin/modern/unifinder/options_button_down.png)
-    skin/modern/calendar/unifinder/options_button_hover.png (skin/modern/unifinder/options_button_hover.png)
-    skin/modern/calendar/unifinder/options_button_up.png (skin/modern/unifinder/options_button_up.png)
     skin/modern/calendar/unifinder/publish_disabled.png (skin/modern/unifinder/publish_disabled.png)
     skin/modern/calendar/unifinder/publish_down.png (skin/modern/unifinder/publish_down.png)
     skin/modern/calendar/unifinder/publish_hover.png (skin/modern/unifinder/publish_hover.png)
@@ -172,9 +168,6 @@ calendar.jar:
     skin/modern/calendar/unifinder/results_bar.png (skin/modern/unifinder/results_bar.png)
     skin/modern/calendar/unifinder/search_deselected.png (skin/modern/unifinder/search_deselected.png)
     skin/modern/calendar/unifinder/search_selected.png (skin/modern/unifinder/search_selected.png)
-    skin/modern/calendar/unifinder/small_options_button_down.png (skin/modern/unifinder/small_options_button_down.png)
-    skin/modern/calendar/unifinder/small_options_button_hover.png (skin/modern/unifinder/small_options_button_hover.png)
-    skin/modern/calendar/unifinder/small_options_button_up.png (skin/modern/unifinder/small_options_button_up.png)
     skin/modern/calendar/unifinder/tab-act-lft-mid.png (skin/modern/unifinder/tab-act-lft-mid.png)
     skin/modern/calendar/unifinder/tab-act-lft-top.png (skin/modern/unifinder/tab-act-lft-top.png)
     skin/modern/calendar/unifinder/tab-act-mid-top.png (skin/modern/unifinder/tab-act-mid-top.png)
diff --git a/mozilla/calendar/resources/skin/modern/unifinder/options_button.png b/mozilla/calendar/resources/skin/modern/unifinder/options_button.png
deleted file mode 100644
index b017a29a86f..00000000000
Binary files a/mozilla/calendar/resources/skin/modern/unifinder/options_button.png and /dev/null differ
diff --git a/mozilla/calendar/resources/skin/modern/unifinder/options_button_down.png b/mozilla/calendar/resources/skin/modern/unifinder/options_button_down.png
deleted file mode 100644
index 04433db9438..00000000000
Binary files a/mozilla/calendar/resources/skin/modern/unifinder/options_button_down.png and /dev/null differ
diff --git a/mozilla/calendar/resources/skin/modern/unifinder/options_button_hover.png b/mozilla/calendar/resources/skin/modern/unifinder/options_button_hover.png
deleted file mode 100644
index d5ca6ee077e..00000000000
Binary files a/mozilla/calendar/resources/skin/modern/unifinder/options_button_hover.png and /dev/null differ
diff --git a/mozilla/calendar/resources/skin/modern/unifinder/options_button_up.png b/mozilla/calendar/resources/skin/modern/unifinder/options_button_up.png
deleted file mode 100644
index 4ba52229a3f..00000000000
Binary files a/mozilla/calendar/resources/skin/modern/unifinder/options_button_up.png and /dev/null differ
diff --git a/mozilla/calendar/resources/skin/modern/unifinder/small_options_button_down.png b/mozilla/calendar/resources/skin/modern/unifinder/small_options_button_down.png
deleted file mode 100644
index 1616c0fccd3..00000000000
Binary files a/mozilla/calendar/resources/skin/modern/unifinder/small_options_button_down.png and /dev/null differ
diff --git a/mozilla/calendar/resources/skin/modern/unifinder/small_options_button_hover.png b/mozilla/calendar/resources/skin/modern/unifinder/small_options_button_hover.png
deleted file mode 100644
index 1efdb04d79f..00000000000
Binary files a/mozilla/calendar/resources/skin/modern/unifinder/small_options_button_hover.png and /dev/null differ
diff --git a/mozilla/calendar/resources/skin/modern/unifinder/small_options_button_up.png b/mozilla/calendar/resources/skin/modern/unifinder/small_options_button_up.png
deleted file mode 100644
index 24be8f080e0..00000000000
Binary files a/mozilla/calendar/resources/skin/modern/unifinder/small_options_button_up.png and /dev/null differ
diff --git a/mozilla/calendar/resources/skin/modern/unifinder/unifinder.css b/mozilla/calendar/resources/skin/modern/unifinder/unifinder.css
index 4c298d124d7..9841953d9c2 100644
--- a/mozilla/calendar/resources/skin/modern/unifinder/unifinder.css
+++ b/mozilla/calendar/resources/skin/modern/unifinder/unifinder.css
@@ -169,9 +169,6 @@ tabpanels {
 
 .unifinder-treecell-box-class
 {
-
-   margin         : 4px;
-   margin-right   : 8px;
    padding        : 2px;
    padding-left   : 4px;
    font-family    : Arial, Helvetica;
@@ -360,6 +357,6 @@ tabpanels {
 {
         font-family             : helvetica;
         font-size               : 10pt;
-        color                   : #000000;
+        color                   : #323642;
 }