diff --git a/mozilla/calendar/resources/content/calendar.xul b/mozilla/calendar/resources/content/calendar.xul
index ed68e9023a2..026a39c16e8 100644
--- a/mozilla/calendar/resources/content/calendar.xul
+++ b/mozilla/calendar/resources/content/calendar.xul
@@ -91,7 +91,7 @@
 
 
 <keyset>
-  <key id="delete_key" keycode="VK_DELETE" observes="delete_command" oncommand="unifinderRemoveCommand( true )"/>
+  <key id="delete_key" keycode="VK_DELETE" observes="delete_command" oncommand="unifinderDeleteCommand( true )"/>
 </keyset>
 
 <!-- Javascript DTD To Variable -->
@@ -119,8 +119,8 @@
 
 <popup id="context-menu">
    <menuitem label="&calendar.context.newevent;" oncommand="newEventCommand()"/>
-   <menuitem label="&calendar.context.modifyevent;" observes="modify_command" oncommand="unifinderModifyCommand()"/>
-   <menuitem label="&calendar.context.deleteevent;" observes="delete_command" oncommand="unifinderRemoveCommand()"/>
+   <menuitem label="&calendar.context.modifyevent;" observes="modify_command" oncommand="unifinderEditCommand()"/>
+   <menuitem label="&calendar.context.deleteevent;" observes="delete_command" oncommand="unifinderDeleteCommand()"/>
    <menuseparator/>
    <menuitem label="&calendar.context.gototoday;" oncommand="gCalendarWindow.goToToday()"/>
    <menuseparator/>
@@ -147,14 +147,16 @@
           grippytooltip="aTooltip" grippytooltiptext="&navigationToolbar.tooltip;"
           tbalign="stretch">
           
-          <toolbarbutton class="toolbarbutton-1" id="calendar-new-event-button"      label="&calendar.newevent.button.label;"        tooltip="aTooltip" tooltiptext="&calendar.newevent.button.tooltip;"     oncommand="newEventCommand()"/>
+          <toolbarbutton class="toolbarbutton-1" id="calendar-new-event-button"      label="&calendar.newevent.button.label;"        tooltiptext="&calendar.newevent.button.tooltip;"     oncommand="newEventCommand()"/>
+          <toolbarbutton class="toolbarbutton-1" id="calendar-edit-event-button"     label="&calendar.edit.button.label;"            tooltiptext="&calendar.edit.button.tooltip;"         oncommand="unifinderEditCommand()" observes="modify_command"/>
+          <toolbarbutton class="toolbarbutton-1" id="calendar-delete-event-button"   label="&calendar.delete.button.label;"          tooltiptext="&calendar.delete.button.tooltip;"       oncommand="unifinderDeleteCommand()" observes="delete_command"/>
           <toolbarseparator class="toolbarseparator-primary"/>
-          <toolbarbutton class="toolbarbutton-1" id="calendar-choose-date-button"    label="&calendar.choosedate.button.label;"      tooltip="aTooltip" tooltiptext="&calendar.choosedate.button.tooltip;"   onmousedown="prepareChooseDate()" popup="oe-date-picker-popup"/>
-          <toolbarbutton class="toolbarbutton-1" id="calendar-go-to-today-button"    label="&calendar.gototoday.button.label;"       tooltip="aTooltip" tooltiptext="&calendar.gototoday.button.tooltip;"    oncommand="gCalendarWindow.goToToday()"/>
+          <toolbarbutton class="toolbarbutton-1" id="calendar-choose-date-button"    label="&calendar.choosedate.button.label;"      tooltiptext="&calendar.choosedate.button.tooltip;"   onmousedown="prepareChooseDate()" popup="oe-date-picker-popup"/>
+          <toolbarbutton class="toolbarbutton-1" id="calendar-go-to-today-button"    label="&calendar.gototoday.button.label;"       tooltiptext="&calendar.gototoday.button.tooltip;"    oncommand="gCalendarWindow.goToToday()"/>
           <toolbarseparator class="toolbarseparator-primary"/>
-          <toolbarbutton class="toolbarbutton-1" id="calendar-day-view-button"       label="&calendar.dayview.button.label;"         tooltip="aTooltip" tooltiptext="&calendar.dayview.button.tooltip;"      oncommand="gCalendarWindow.switchToDayView()"/>
-          <toolbarbutton class="toolbarbutton-1" id="calendar-week-view-button"      label="&calendar.weekview.button.label;"        tooltip="aTooltip" tooltiptext="&calendar.weekview.button.tooltip;"     oncommand="gCalendarWindow.switchToWeekView()"/>
-          <toolbarbutton class="toolbarbutton-1" id="calendar-month-view-button"     label="&calendar.monthview.button.label;"       tooltip="aTooltip" tooltiptext="&calendar.monthview.button.tooltip;"    oncommand="gCalendarWindow.switchToMonthView()"/>
+          <toolbarbutton class="toolbarbutton-1" id="calendar-day-view-button"       label="&calendar.dayview.button.label;"         tooltiptext="&calendar.dayview.button.tooltip;"      oncommand="gCalendarWindow.switchToDayView()"/>
+          <toolbarbutton class="toolbarbutton-1" id="calendar-week-view-button"      label="&calendar.weekview.button.label;"        tooltiptext="&calendar.weekview.button.tooltip;"     oncommand="gCalendarWindow.switchToWeekView()"/>
+          <toolbarbutton class="toolbarbutton-1" id="calendar-month-view-button"     label="&calendar.monthview.button.label;"       tooltiptext="&calendar.monthview.button.tooltip;"    oncommand="gCalendarWindow.switchToMonthView()"/>
           <spacer flex="1"/>
           <hbox id="throbber-box" align="center">
              <button id="navigator-throbber" oncommand="goClickThrobber('browser.throbber.url')"
@@ -174,34 +176,11 @@
    	<hbox id="calendar-content-box" flex="1">
 
          <vbox flex="1">
-            <toolbox>
-               <toolbar class="unifinder-toolbar chromeclass-toolbar" flex="1">
-                  <button orient="vertical" observes="delete_command" class="unifinder-remove-button plain" tooltiptext="&calendar.tools.delete.tooltip;" label="&calendar.delete.label;" oncommand="unifinderRemoveCommand()"/>
-                  <button orient="vertical" observes="modify_command" class="unifinder-modify-button plain" tooltiptext="&calendar.tools.modify.tooltip;" label="&calendar.modify.label;" oncommand="unifinderModifyCommand()"/>
-               </toolbar>
-            </toolbox>
-            <box flex="1">
-               <tabbox class="unifinder-tab-box" orient="vertical" flex="1" persist="selectedTab">
-                   <tabs>
-                      <tab label="&calendar.main.tab.label;" />
-                      <tab label="&calendar.search.tab.label;" />
-                   </tabs>
-                   
-                   <tabpanels flex="1">
-                      <tabpanel id="unifinder-categories-box" flex="1">
-                         <listbox id="unifinder-categories-tree" seltype="multiple" onselect="unifinderClickEvent( this )" class="unifinder-tree-class" flex="1"/>
-                      </tabpanel>
-               
-                      <tabpanel orient="vertical" flex="1">
-                         <box align="center">
-                            <label control="unifinder-search-field" value="&calendar.search.options.searchfor;"/>
-                            <textbox id="unifinder-search-field" onkeypress="unifinderSearchKeyPress( this, event )" flex="1"/>
-                         </box>
-                         <listbox id="unifinder-search-results-tree" seltype="multiple" onselect="unifinderClickEvent( this )" class="unifinder-tree-class" flex="1"/>
-                      </tabpanel>
-                   </tabpanels>
-               </tabbox>
+            <box align="center">
+               <label control="unifinder-search-field" value="&calendar.search.options.searchfor;"/>
+               <textbox id="unifinder-search-field" onkeypress="unifinderSearchKeyPress( this, event )" flex="1"/>
             </box>
+            <listbox id="unifinder-search-results-tree" seltype="multiple" onselect="unifinderClickEvent( this )" class="unifinder-tree-class" flex="1"/>
          </vbox>
        
    		<splitter collapse="before" persist="state hidden collapsed"
diff --git a/mozilla/calendar/resources/content/calendarMenuOverlay.xul b/mozilla/calendar/resources/content/calendarMenuOverlay.xul
index 007519ffa67..e0f73b60d9b 100644
--- a/mozilla/calendar/resources/content/calendarMenuOverlay.xul
+++ b/mozilla/calendar/resources/content/calendarMenuOverlay.xul
@@ -111,8 +111,8 @@
    <menu id="menu_Event" label="&event.menu.title;" accesskey="&eventMenuCmd.accesskey;">
       <menupopup id="mppEvent">
          <menuitem id="calendar-new-event-menu" label="&event.new.event;" oncommand="newEventCommand()"/>
-         <menuitem id="unifinder-modify-menu" observes="modify_command" label="&event.edit.event;" oncommand="unifinderModifyCommand()" />
-         <menuitem id="unifinder-remove-menu" observes="delete_command" label="&event.delete.event;" oncommand="unifinderRemoveCommand()" key="delete_key" />
+         <menuitem id="unifinder-modify-menu" observes="modify_command" label="&event.edit.event;" oncommand="unifinderEditCommand()" />
+         <menuitem id="unifinder-remove-menu" observes="delete_command" label="&event.delete.event;" oncommand="unifinderDeleteCommand()" key="delete_key" />
          <menuseparator/>
          <menuitem id="calendar-mail-event" observes="send_event_command" label="&event.mail.event;" oncommand="sendEvent();"/>
       </menupopup>
diff --git a/mozilla/calendar/resources/content/menuOverlay.xul b/mozilla/calendar/resources/content/menuOverlay.xul
index 007519ffa67..e0f73b60d9b 100644
--- a/mozilla/calendar/resources/content/menuOverlay.xul
+++ b/mozilla/calendar/resources/content/menuOverlay.xul
@@ -111,8 +111,8 @@
    <menu id="menu_Event" label="&event.menu.title;" accesskey="&eventMenuCmd.accesskey;">
       <menupopup id="mppEvent">
          <menuitem id="calendar-new-event-menu" label="&event.new.event;" oncommand="newEventCommand()"/>
-         <menuitem id="unifinder-modify-menu" observes="modify_command" label="&event.edit.event;" oncommand="unifinderModifyCommand()" />
-         <menuitem id="unifinder-remove-menu" observes="delete_command" label="&event.delete.event;" oncommand="unifinderRemoveCommand()" key="delete_key" />
+         <menuitem id="unifinder-modify-menu" observes="modify_command" label="&event.edit.event;" oncommand="unifinderEditCommand()" />
+         <menuitem id="unifinder-remove-menu" observes="delete_command" label="&event.delete.event;" oncommand="unifinderDeleteCommand()" key="delete_key" />
          <menuseparator/>
          <menuitem id="calendar-mail-event" observes="send_event_command" label="&event.mail.event;" oncommand="sendEvent();"/>
       </menupopup>
diff --git a/mozilla/calendar/resources/content/unifinder.js b/mozilla/calendar/resources/content/unifinder.js
index e47481c1932..0e6141c6e47 100644
--- a/mozilla/calendar/resources/content/unifinder.js
+++ b/mozilla/calendar/resources/content/unifinder.js
@@ -52,45 +52,29 @@ function unifinderInit( CalendarWindow )
    {
       onSelectionChanged : function( EventSelectionArray )
       {
-         var CategoriesTree = document.getElementById( "unifinder-categories-tree" );
-         
-         CategoriesTree.setAttribute( "suppressonselect", "true" );
-         
          var SearchTree = document.getElementById( "unifinder-search-results-tree" );
          
          SearchTree.setAttribute( "suppressonselect", "true" );
 
-         CategoriesTree.clearSelection();
-
          SearchTree.clearSelection();
          
          if( EventSelectionArray.length > 0 )
          {
             for( i = 0; i < EventSelectionArray.length; i++ )
             {
-               var CategoriesTreeItem = document.getElementById( "unifinder-treeitem-"+EventSelectionArray[i].id );
-
                var SearchTreeItem = document.getElementById( "search-unifinder-treeitem-"+EventSelectionArray[i].id );
                
-               //you need this for when an event is added.  It doesn't yet exist.
-               if( CategoriesTreeItem )
-                  CategoriesTree.addItemToSelection( CategoriesTreeItem );
-   
                //you need this for when an event is added. It doesn't yet exist.
                if( SearchTreeItem )
                   SearchTree.addItemToSelection( SearchTreeItem );
             }
          }
          dump( "\nAllow on select now!" );
-         CategoriesTree.removeAttribute( "suppressonselect" );
-         
          SearchTree.removeAttribute( "suppressonselect" );
       }
    }
       
    gCalendarWindow.EventSelection.addObserver( unifinderEventSelectionObserver );
-
-
 }
 
 
@@ -189,24 +173,12 @@ function unifinderRefesh()
 {
    var eventTable = gEventSource.getAllEvents();
    
-   refreshCategoriesTree( eventTable );
-   
    refreshSearchTree( eventTable );
 
    unifinderSearchKeyPress( document.getElementById( 'unifinder-search-field' ), null );
 }
 
 
-/**
-*   Redraw the event tree
-*/
-
-function refreshCategoriesTree( eventTable )
-{
-   refreshEventTree( eventTable, "unifinder-categories-tree" );
-}
-
-
 /**
 *  Redraw the search tree
 */
@@ -274,12 +246,12 @@ function unifinderClickEvent( CallingListBox )
 }
 
 /**
-*  This is called from the unifinder's modify command
+*  This is called from the unifinder's edit command
 */
 
-function unifinderModifyCommand()
+function unifinderEditCommand()
 {
-   var SelectedItem = document.getElementById( "unifinder-categories-tree" ).selectedItems[0];
+   var SelectedItem = document.getElementById( "unifinder-search-results-tree" ).selectedItems[0];
 
    if( SelectedItem )
    {
@@ -301,10 +273,10 @@ function unifinderModifyCommand()
 
 
 /**
-*  This is called from the unifinder's remove command
+*  This is called from the unifinder's delete command
 */
 
-function unifinderRemoveCommand( DoNotConfirm )
+function unifinderDeleteCommand( DoNotConfirm )
 {
    var SelectedItems = gCalendarWindow.EventSelection.selectedEvents;
    
diff --git a/mozilla/calendar/resources/jar.mn b/mozilla/calendar/resources/jar.mn
index a521f3b45fd..f565a3301f3 100644
--- a/mozilla/calendar/resources/jar.mn
+++ b/mozilla/calendar/resources/jar.mn
@@ -105,7 +105,6 @@ calendar.jar:
     skin/modern/calendar/remove_down.png (skin/modern/remove_down.png)
     skin/modern/calendar/remove_hover.png (skin/modern/remove_hover.png)
     skin/modern/calendar/remove_up.png (skin/modern/remove_up.png)
-    skin/modern/calendar/unifinder.css (skin/modern/unifinder.css)
     skin/classic/calendar/all_day_event.gif (skin/classic/all_day_event.gif)
     skin/classic/calendar/all_day_event_down.gif (skin/classic/all_day_event_down.gif)
     skin/classic/calendar/all_day_event_hover.gif (skin/classic/all_day_event_hover.gif)
@@ -174,4 +173,3 @@ calendar.jar:
     skin/classic/calendar/remove_down.png (skin/classic/remove_down.png)
     skin/classic/calendar/remove_hover.png (skin/classic/remove_hover.png)
     skin/classic/calendar/remove_up.png (skin/classic/remove_up.png)
-    skin/classic/calendar/unifinder.css (skin/classic/unifinder.css)
diff --git a/mozilla/calendar/resources/locale/en-US/calendar.dtd b/mozilla/calendar/resources/locale/en-US/calendar.dtd
index 19eb22b126c..3cf79090822 100644
--- a/mozilla/calendar/resources/locale/en-US/calendar.dtd
+++ b/mozilla/calendar/resources/locale/en-US/calendar.dtd
@@ -83,9 +83,9 @@
 
 <!ENTITY event.alarm.checkbox.label "Remind me again in " >
 
-<!ENTITY event.title.alarm         "ALARM" >
-<!ENTITY event.title.new         "NEW EVENT" >
-<!ENTITY event.title.edit        "EDIT EVENT" >
+<!ENTITY event.title.alarm         "Alarm" >
+<!ENTITY event.title.new         "New Event" >
+<!ENTITY event.title.edit        "Edit Event" >
 
 <!ENTITY event.tip.new         "Create a new event." >
 <!ENTITY event.tip.edit        "Edit an existing event." >
@@ -99,22 +99,24 @@
 <!ENTITY calendar.flat.topbar.weekview         "Week View" >
 <!ENTITY calendar.flat.topbar.monthview        "Month View" >
 
-<!ENTITY calendar.tools.delete.tooltip         "Delete Event" >
-<!ENTITY calendar.tools.modify.tooltip         "Edit Event" >
-
-<!ENTITY calendar.delete.label         "Delete" >
-<!ENTITY calendar.modify.label         "Edit" >
-
 <!ENTITY calendar.newevent.button.tooltip         "Create New Calendar Event" >
+<!ENTITY calendar.delete.button.tooltip           "Delete Event" >
+<!ENTITY calendar.edit.button.tooltip             "Edit Event" >
+
 <!ENTITY calendar.gototoday.button.tooltip        "Go To Today" >
 <!ENTITY calendar.choosedate.button.tooltip       "Pick Date To Go To" >
+
 <!ENTITY calendar.dayview.button.tooltip          "Switch To Day View" >
 <!ENTITY calendar.weekview.button.tooltip         "Switch To Week View" >
 <!ENTITY calendar.monthview.button.tooltip        "Switch To Month View" >
 
 <!ENTITY calendar.newevent.button.label         "New Event" >
+<!ENTITY calendar.delete.button.label           "Delete" >
+<!ENTITY calendar.edit.button.label             "Edit" >
+
 <!ENTITY calendar.gototoday.button.label        "Today" >
 <!ENTITY calendar.choosedate.button.label       "Choose Date" >
+
 <!ENTITY calendar.dayview.button.label          "Day" >
 <!ENTITY calendar.weekview.button.label         "Week" >
 <!ENTITY calendar.monthview.button.label        "Month" >
@@ -125,7 +127,7 @@
 <!ENTITY calendar.main.tab.label        "Events" >
 <!ENTITY calendar.search.tab.label			        "Search">
 
-<!ENTITY calendar.search.options.searchfor			"Search For">
+<!ENTITY calendar.search.options.searchfor			"Event contains:">
 
 <!ENTITY calendar.portlet.outliner.titlecol "Title" >
 <!ENTITY calendar.portlet.outliner.datecol  "Date" >
diff --git a/mozilla/calendar/resources/skin/classic/calendar.css b/mozilla/calendar/resources/skin/classic/calendar.css
index ab97765fc61..76cc6847616 100644
--- a/mozilla/calendar/resources/skin/classic/calendar.css
+++ b/mozilla/calendar/resources/skin/classic/calendar.css
@@ -93,6 +93,57 @@
     list-style-image        : url("chrome://calendar/skin/newitem_down.gif");
   }
 
+/*--------------------------------------------------------------------
+ *   edit event button
+ *-------------------------------------------------------------------*/
+
+#calendar-edit-event-button
+{
+   list-style-image        : url("chrome://calendar/skin/modify_up.png");
+}
+
+#calendar-edit-event-button[disabled="true"],
+#calendar-edit-event-button[disabled="true"]:hover,
+#calendar-edit-event-button[disabled="true"]:hover:active
+{
+   list-style-image        : url("chrome://calendar/skin/modify_disabled.png");
+}
+
+#calendar-edit-event-button:hover
+{
+   list-style-image        : url("chrome://calendar/skin/modify_hover.png");
+}
+
+#calendar-edit-event-button:hover:active
+{
+   list-style-image        : url("chrome://calendar/skin/modify_down.png");
+}
+
+/*--------------------------------------------------------------------
+ *   delete event button
+ *-------------------------------------------------------------------*/
+
+#calendar-delete-event-button
+{
+   list-style-image        : url("chrome://calendar/skin/remove_up.png");
+}
+  
+#calendar-delete-event-button[disabled="true"],
+#calendar-delete-event-button[disabled="true"]:hover,
+#calendar-delete-event-button[disabled="true"]:hover:active
+{
+   list-style-image        : url("chrome://calendar/skin/remove_disabled.png");
+}
+
+#calendar-delete-event-button:hover
+{
+   list-style-image        : url("chrome://calendar/skin/remove_hover.png");
+}
+
+#calendar-delete-event-button:hover:active
+{
+   list-style-image        : url("chrome://calendar/skin/remove_down.png");
+}
 
 /*--------------------------------------------------------------------
  *   Go To Today button
@@ -1028,3 +1079,28 @@
   background-image: url("chrome://calendar/skin/calendar_topbar.gif");
 }
 
+.unifinder-tree-class > listitem[selected="true"] 
+{
+   background-color     : white;
+   color                : black;
+   border		         : none;
+}
+
+.unifinder-tree-class > listitem[selected="true"] > listcell
+{
+   border                  : none;
+}
+
+.unifinder-tree-class > listitem[selected="true"] > listcell > .unifinder-treecell-box-class
+{
+   background-color        : #d5e3f2; 
+}
+
+.unifinder-treecell-box-class
+{
+   padding              : 2px;
+   padding-left         : 4px;
+   font-family          : Arial, Helvetica;
+   -moz-box-align       : start;
+}
+
diff --git a/mozilla/calendar/resources/skin/classic/unifinder.css b/mozilla/calendar/resources/skin/classic/unifinder.css
deleted file mode 100644
index dc12c02d36c..00000000000
--- a/mozilla/calendar/resources/skin/classic/unifinder.css
+++ /dev/null
@@ -1,136 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is OEone Calendar Code, released October 31st, 2001.
- *
- * The Initial Developer of the Original Code is
- * OEone Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Garth Smedley <garths@oeone.com>
- *                 Mike Potter <mikep@oeone.com>
- *                 Colin Phillips <colinp@oeone.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* ::::: tabpanels ::::: */
-
-tabpanels {
-   border: none;
-}
-
-.unifinder-tab-box
-{
-   margin-top             : 4px 
-}
-
-.unifinder-tree-class > listitem[selected="true"] 
-{
-   background-color     : white;
-   color                : black;
-   border		         : none;
-}
-
-.unifinder-tree-class > listitem[selected="true"] > listcell
-{
-   border                  : none;
-}
-
-.unifinder-tree-class > listitem[selected="true"] > listcell > .unifinder-treecell-box-class
-{
-   background-color        : #d5e3f2; 
-}
-
-.unifinder-treecell-box-class
-{
-   padding              : 2px;
-   padding-left         : 4px;
-   font-family          : Arial, Helvetica;
-   -moz-box-align       : start;
-}
-
-/*--------------------------------------------------------------------
- *   modify button
- *-------------------------------------------------------------------*/
-
-.unifinder-modify-button
-{
-	font-family             : helvetica;
-	font-size               : 10pt;
-	color                   : #323642;
-   list-style-image        : url("chrome://calendar/skin/modify_up.png");
-	min-width					: 0px;
-}
-
-.unifinder-modify-button[disabled="true"],
-.unifinder-modify-button[disabled="true"]:hover,
-.unifinder-modify-button[disabled="true"]:hover:active
-{
-	color: #9399AB !important;
-   list-style-image        : url("chrome://calendar/skin/modify_disabled.png");
-}
-
-.unifinder-modify-button:hover
-{
-   list-style-image        : url("chrome://calendar/skin/modify_hover.png");
-}
-
-.unifinder-modify-button:hover:active
-{
-   list-style-image        : url("chrome://calendar/skin/modify_down.png");
-}
-
-/*--------------------------------------------------------------------
- *   remove button
- *-------------------------------------------------------------------*/
-
-.unifinder-remove-button
-{
-	font-family             : helvetica;
-	font-size               : 10pt;
-	color                   : #323642;
-   list-style-image        : url("chrome://calendar/skin/remove_up.png");
-	min-width					: 0px;
-}
-  
-.unifinder-remove-button[disabled="true"],
-.unifinder-remove-button[disabled="true"]:hover,
-.unifinder-remove-button[disabled="true"]:hover:active
-{
-	color: #9399AB !important;
-   list-style-image        : url("chrome://calendar/skin/remove_disabled.png");
-}
-
-.unifinder-remove-button:hover
-{
-   list-style-image        : url("chrome://calendar/skin/remove_hover.png");
-}
-
-.unifinder-remove-button:hover:active
-{
-   list-style-image        : url("chrome://calendar/skin/remove_down.png");
-}
-
diff --git a/mozilla/calendar/resources/skin/modern/calendar.css b/mozilla/calendar/resources/skin/modern/calendar.css
index cd58fd0b0f9..62ee44a1efd 100644
--- a/mozilla/calendar/resources/skin/modern/calendar.css
+++ b/mozilla/calendar/resources/skin/modern/calendar.css
@@ -94,6 +94,59 @@
     list-style-image        : url("chrome://calendar/skin/newitem_down.gif");
   }
 
+/*--------------------------------------------------------------------
+ *   edit event button
+ *-------------------------------------------------------------------*/
+
+#calendar-edit-event-button 
+{
+    padding-top:	1px;
+   list-style-image        : url("chrome://calendar/skin/modify_up.png");
+}
+
+#calendar-edit-event-button[disabled="true"],
+#calendar-edit-event-button[disabled="true"]:hover,
+#calendar-edit-event-button[disabled="true"]:hover:active
+{
+   list-style-image        : url("chrome://calendar/skin/modify_disabled.png");
+}
+
+#calendar-edit-event-button:hover
+{
+    list-style-image       : url("chrome://calendar/skin/modify_hover.png");
+}
+
+#calendar-edit-event-button:hover:active
+{
+    list-style-image       : url("chrome://calendar/skin/modify_down.png");
+}
+
+/*--------------------------------------------------------------------
+ *   delete event button
+ *-------------------------------------------------------------------*/
+
+#calendar-delete-event-button
+{
+    padding-top:	1px;
+	list-style-image        : url("chrome://calendar/skin/remove_up.png");
+}
+  
+#calendar-delete-event-button[disabled="true"],
+#calendar-delete-event-button[disabled="true"]:hover,
+#calendar-delete-event-button[disabled="true"]:hover:active
+{
+	list-style-image        : url("chrome://calendar/skin/remove_disabled.png");
+}
+
+#calendar-delete-event-button:hover
+{
+    list-style-image       : url("chrome://calendar/skin/remove_hover.png");
+}
+
+#calendar-delete-event-button:hover:active
+{
+    list-style-image       : url("chrome://calendar/skin/remove_down.png");
+}
 
 /*--------------------------------------------------------------------
  *   Go To Today button
@@ -1030,3 +1083,29 @@
   background-image: url("chrome://calendar/skin/calendar_topbar.gif");
 }
 
+.unifinder-tree-class > listitem[selected="true"] 
+{
+   background-color     : white;
+   color                : black;
+   border               : none;
+}
+
+.unifinder-tree-class > listitem[selected="true"] > listcell
+{
+   border                  : none;
+}
+
+.unifinder-tree-class > listitem[selected="true"] > listcell > .unifinder-treecell-box-class
+{
+   background-color        : #d5e3f2; 
+}
+
+.unifinder-treecell-box-class
+{
+   padding              : 2px;
+   padding-left         : 4px;
+   font-family          : Arial, Helvetica;
+   -moz-box-align       : start;
+}
+
+
diff --git a/mozilla/calendar/resources/skin/modern/unifinder.css b/mozilla/calendar/resources/skin/modern/unifinder.css
deleted file mode 100644
index 4efe0f69620..00000000000
--- a/mozilla/calendar/resources/skin/modern/unifinder.css
+++ /dev/null
@@ -1,149 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is OEone Calendar Code, released October 31st, 2001.
- *
- * The Initial Developer of the Original Code is
- * OEone Corporation.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s): Garth Smedley <garths@oeone.com>
- *                 Mike Potter <mikep@oeone.com>
- *                 Colin Phillips <colinp@oeone.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-.unifinder-toolbar
-{
-   background-color       : #dde3eb;
-}
-
-/* ::::: tabpanels ::::: */
-
-tabpanels {
-   border: none;
-}
-
-.unifinder-tab-box
-{
-   margin-top             : 4px 
-}
-
-.unifinder-tree-class > listitem[selected="true"] 
-{
-   background-color     : white;
-   color                : black;
-   border               : none;
-}
-
-.unifinder-tree-class > listitem[selected="true"] > listcell
-{
-   border                  : none;
-}
-
-.unifinder-tree-class > listitem[selected="true"] > listcell > .unifinder-treecell-box-class
-{
-   background-color        : #d5e3f2; 
-}
-
-.unifinder-treecell-box-class
-{
-   padding              : 2px;
-   padding-left         : 4px;
-   font-family          : Arial, Helvetica;
-   -moz-box-align       : start;
-}
-
-/*--------------------------------------------------------------------
- *   modify button
- *-------------------------------------------------------------------*/
-
-.unifinder-modify-button
-{
-	font-family             : helvetica;
-	font-size               : 10pt;
-	color                   : #323642;
-	background-color			: #DDE3EB;
-   list-style-image        : url("chrome://calendar/skin/modify_up.png");
-	min-width					: 0px;
-}
-
-.unifinder-modify-button[disabled="true"],
-.unifinder-modify-button[disabled="true"]:hover,
-.unifinder-modify-button[disabled="true"]:hover:active
-{
-	color							: #9399AB !important;
-	background-color			: #DDE3EB !important;
-   list-style-image        : url("chrome://calendar/skin/modify_disabled.png");
-}
-
-.unifinder-modify-button:hover
-{
-	 background-color			: #EAEEF6;
-    list-style-image       : url("chrome://calendar/skin/modify_hover.png");
-}
-
-.unifinder-modify-button:hover:active
-{
-	 background-color			: #CBD9E8;
-    list-style-image       : url("chrome://calendar/skin/modify_down.png");
-}
-
-/*--------------------------------------------------------------------
- *   remove button
- *-------------------------------------------------------------------*/
-
-.unifinder-remove-button
-{
-	font-family             : helvetica;
-	font-size               : 10pt;
-	color                   : #323642;
-	background-color			: #DDE3EB;
-	list-style-image        : url("chrome://calendar/skin/remove_up.png");
-	min-width					: 0px;
-}
-  
-.unifinder-remove-button[disabled="true"],
-.unifinder-remove-button[disabled="true"]:hover,
-.unifinder-remove-button[disabled="true"]:hover:active
-{
-	color							: #9399AB !important;
-	background-color			: #DDE3EB !important;
-	list-style-image        : url("chrome://calendar/skin/remove_disabled.png");
-}
-
-.unifinder-remove-button:hover
-{
-	 background-color			: #EAEEF6;
-    list-style-image       : url("chrome://calendar/skin/remove_hover.png");
-}
-
-.unifinder-remove-button:hover:active
-{
-	 background-color			: #CBD9E8;
-    list-style-image       : url("chrome://calendar/skin/remove_down.png");
-}
-