diff --git a/calendar/resources/content/calendar.js b/calendar/resources/content/calendar.js
index f2e55d548b52..e44e3459c2b7 100644
--- a/calendar/resources/content/calendar.js
+++ b/calendar/resources/content/calendar.js
@@ -180,8 +180,6 @@ function update_date( Refresh )
 
 function calendarFinish()
 {
-   finishCalendarUnifinder( gEventSource );
-   
    gCalendarWindow.close( );
 }
 
diff --git a/calendar/resources/content/calendar.xul b/calendar/resources/content/calendar.xul
index f03761d9f4ef..55a95cabe384 100644
--- a/calendar/resources/content/calendar.xul
+++ b/calendar/resources/content/calendar.xul
@@ -45,7 +45,7 @@
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
 <?xml-stylesheet href="chrome://calendar/skin/calendar.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/communicator.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/content/unifinder/unifinderxul.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://calendar/skin/unifinder.css" type="text/css"?>
 
 
 <!-- Overlays -->
@@ -53,7 +53,6 @@
 <?xul-overlay href="chrome://calendar/content/calendarMenuOverlay.xul"?>
 <?xul-overlay href="chrome://calendar/content/datepicker/datepicker-overlay.xul"?>
 
-<?xul-overlay href="chrome://calendar/content/unifinder/unifinderOverlay.xul"?>
 <?xul-overlay href="chrome://calendar/content/calendarDayView.xul"?>
 <?xul-overlay href="chrome://calendar/content/calendarWeekView.xul"?>
 <?xul-overlay href="chrome://calendar/content/calendarMonthView.xul"?>
@@ -109,7 +108,7 @@
 <!-- NEEDED FOR DATE UTILS -->
 <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 <script type="application/x-javascript" src="chrome://calendar/content/dateUtils.js"/>
-<script type="application/x-javascript" src="chrome://calendar/content/unifinder/unifinder.js"/>
+<script type="application/x-javascript" src="chrome://calendar/content/unifinder.js"/>
 
 <script type="application/x-javascript" src="chrome://calendar/content/calendar.js"/>
 <script type="application/x-javascript" src="chrome://calendar/content/calendarEvent.js"/>
@@ -174,17 +173,43 @@
     
    	<hbox id="calendar-content-box" flex="1">
 
-      
-   		<!-- UNIFINDER OVERLAY  -->
-    
-   		<unifinder id="calendar-unifinder-overlay" menu-popup="unifinder-options-menu" 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>
+         </vbox>
        
-   		<splitter id="unifinder-splitter" collapse="before" persist="state hidden collapsed"
-              class="chromeclass-extrachrome sidebar-splitter"
-              orient="horizontal">
-          <grippy class="sidebar-splitter-grippy"/>
+   		<splitter collapse="before" persist="state hidden collapsed"
+              class="chromeclass-extrachrome sidebar-splitter" orient="horizontal">
+            <grippy class="sidebar-splitter-grippy"/>
          </splitter>
-   		<!-- Begin Day/Month/Week Deck -->
+   		
+         <!-- Begin Day/Month/Week Deck -->
          <deck id="calendar-deck" selectedIndex="0" flex="1">
    				 
    			 <!-- Calendar Month View -->
diff --git a/calendar/resources/content/calendarEventDialog.xul b/calendar/resources/content/calendarEventDialog.xul
index 47e588d79807..d54ac9f6d1e4 100644
--- a/calendar/resources/content/calendarEventDialog.xul
+++ b/calendar/resources/content/calendarEventDialog.xul
@@ -136,7 +136,7 @@
                         </hbox>
                         <hbox  id="start-date-box" align="center">
                             <textbox class="date-text-class" id="start-date-text" readonly="true"                 onmousedown="prepareDatePicker('start-date-text')" popup="oe-date-picker-popup" position="after_start"/>
-                            <image class="four-state-image-button event-date-button-class" id="start-date-button" onmousedown="prepareDatePicker('start-date-text')" popup="oe-date-picker-popup" position="after_start" />
+                            <image class="event-date-button-class" id="start-date-button" onmousedown="prepareDatePicker('start-date-text')" popup="oe-date-picker-popup" position="after_start" />
                         </hbox>
                     </row>
                     
@@ -147,7 +147,7 @@
                         </hbox>
                         <hbox  id="end-date-box" align="center">
                             <textbox class="date-text-class" id="end-date-text" readonly="true"                 onmousedown="prepareDatePicker('end-date-text')" popup="oe-date-picker-popup" position="after_start"/>
-                            <image class="four-state-image-button event-date-button-class" id="end-date-button" onmousedown="prepareDatePicker('end-date-text')" popup="oe-date-picker-popup" position="after_start" />
+                            <image class="event-date-button-class" id="end-date-button" onmousedown="prepareDatePicker('end-date-text')" popup="oe-date-picker-popup" position="after_start" />
                         </hbox>
                     </row>
                     
@@ -165,7 +165,7 @@
                         </hbox>
                         <hbox id="start-event-time-box" align="center">
                             <textbox id="start-time-text" readonly="true" value=""      onmousedown="prepareTimePicker('start-time-text')" popup="oe-time-picker-popup" position="after_start"/>
-                            <image class="four-state-image-button" id="start-time-button" onmousedown="prepareTimePicker('start-time-text')" popup="oe-time-picker-popup" position="after_start"/>
+                            <image id="start-time-button" onmousedown="prepareTimePicker('start-time-text')" popup="oe-time-picker-popup" position="after_start"/>
                         </hbox>
                     </row>
                     
@@ -177,7 +177,7 @@
                         </hbox>
                         <hbox id="end-event-time-box" align="center">
                             <textbox id="end-time-text" readonly="true" value=""      onmousedown="prepareTimePicker('end-time-text')" popup="oe-time-picker-popup" position="after_start"/>
-                            <image class="four-state-image-button" id="end-time-button" onmousedown="prepareTimePicker('end-time-text')" popup="oe-time-picker-popup" position="after_start"/>
+                            <image id="end-time-button" onmousedown="prepareTimePicker('end-time-text')" popup="oe-time-picker-popup" position="after_start"/>
                         </hbox>
                     </row>
                     
@@ -288,7 +288,7 @@
                                   <radio group="repeat-until-group" id="repeat-until-radio" disable-controller="repeat" selected="true" label="&newevent.until.label;"   oncommand="commandUntil()"/>
                                   <spacer id="until-spacer"/>
                                   <textbox id="repeat-end-date-text" readonly="true" value="" onmousedown="prepareDatePicker('repeat-end-date-text')" popup="oe-date-picker-popup"  position="before_start"/>
-                                  <image class="four-state-image-button" id="repeat-end-date-button" onmousedown="prepareDatePicker('repeat-end-date-text')" popup="oe-date-picker-popup"  position="before_start"/>
+                                  <image id="repeat-end-date-button" onmousedown="prepareDatePicker('repeat-end-date-text')" popup="oe-date-picker-popup"  position="before_start"/>
                               </hbox>
                               
                               
diff --git a/calendar/resources/content/datepicker/datepicker.js b/calendar/resources/content/datepicker/datepicker.js
index febe6fcfbb6f..160c71e47d51 100644
--- a/calendar/resources/content/datepicker/datepicker.js
+++ b/calendar/resources/content/datepicker/datepicker.js
@@ -52,11 +52,6 @@
     <popup  id="oe-date-picker-popup"  oncommand="yourCommandFunction( this )" >
     </popup>
 * 
-* Attach the date picker to an item using the popup attribute, an image for example:
-* 
-      <image class="four-state-image-button" popup="oe-date-picker-popup" onmousedown="yourPrepareDatePickerFunction()"  />
- 
-* 
 * In your .js, initialize the picker with the inital date when the user clicks, set to now in this example:
 * 
       function yourPrepareDatePickerFunction( )
diff --git a/calendar/resources/content/eventDialog.xul b/calendar/resources/content/eventDialog.xul
index 47e588d79807..d54ac9f6d1e4 100644
--- a/calendar/resources/content/eventDialog.xul
+++ b/calendar/resources/content/eventDialog.xul
@@ -136,7 +136,7 @@
                         </hbox>
                         <hbox  id="start-date-box" align="center">
                             <textbox class="date-text-class" id="start-date-text" readonly="true"                 onmousedown="prepareDatePicker('start-date-text')" popup="oe-date-picker-popup" position="after_start"/>
-                            <image class="four-state-image-button event-date-button-class" id="start-date-button" onmousedown="prepareDatePicker('start-date-text')" popup="oe-date-picker-popup" position="after_start" />
+                            <image class="event-date-button-class" id="start-date-button" onmousedown="prepareDatePicker('start-date-text')" popup="oe-date-picker-popup" position="after_start" />
                         </hbox>
                     </row>
                     
@@ -147,7 +147,7 @@
                         </hbox>
                         <hbox  id="end-date-box" align="center">
                             <textbox class="date-text-class" id="end-date-text" readonly="true"                 onmousedown="prepareDatePicker('end-date-text')" popup="oe-date-picker-popup" position="after_start"/>
-                            <image class="four-state-image-button event-date-button-class" id="end-date-button" onmousedown="prepareDatePicker('end-date-text')" popup="oe-date-picker-popup" position="after_start" />
+                            <image class="event-date-button-class" id="end-date-button" onmousedown="prepareDatePicker('end-date-text')" popup="oe-date-picker-popup" position="after_start" />
                         </hbox>
                     </row>
                     
@@ -165,7 +165,7 @@
                         </hbox>
                         <hbox id="start-event-time-box" align="center">
                             <textbox id="start-time-text" readonly="true" value=""      onmousedown="prepareTimePicker('start-time-text')" popup="oe-time-picker-popup" position="after_start"/>
-                            <image class="four-state-image-button" id="start-time-button" onmousedown="prepareTimePicker('start-time-text')" popup="oe-time-picker-popup" position="after_start"/>
+                            <image id="start-time-button" onmousedown="prepareTimePicker('start-time-text')" popup="oe-time-picker-popup" position="after_start"/>
                         </hbox>
                     </row>
                     
@@ -177,7 +177,7 @@
                         </hbox>
                         <hbox id="end-event-time-box" align="center">
                             <textbox id="end-time-text" readonly="true" value=""      onmousedown="prepareTimePicker('end-time-text')" popup="oe-time-picker-popup" position="after_start"/>
-                            <image class="four-state-image-button" id="end-time-button" onmousedown="prepareTimePicker('end-time-text')" popup="oe-time-picker-popup" position="after_start"/>
+                            <image id="end-time-button" onmousedown="prepareTimePicker('end-time-text')" popup="oe-time-picker-popup" position="after_start"/>
                         </hbox>
                     </row>
                     
@@ -288,7 +288,7 @@
                                   <radio group="repeat-until-group" id="repeat-until-radio" disable-controller="repeat" selected="true" label="&newevent.until.label;"   oncommand="commandUntil()"/>
                                   <spacer id="until-spacer"/>
                                   <textbox id="repeat-end-date-text" readonly="true" value="" onmousedown="prepareDatePicker('repeat-end-date-text')" popup="oe-date-picker-popup"  position="before_start"/>
-                                  <image class="four-state-image-button" id="repeat-end-date-button" onmousedown="prepareDatePicker('repeat-end-date-text')" popup="oe-date-picker-popup"  position="before_start"/>
+                                  <image id="repeat-end-date-button" onmousedown="prepareDatePicker('repeat-end-date-text')" popup="oe-date-picker-popup"  position="before_start"/>
                               </hbox>
                               
                               
diff --git a/calendar/resources/content/penBindings.xml b/calendar/resources/content/penBindings.xml
deleted file mode 100644
index ad5d7b54b24d..000000000000
--- a/calendar/resources/content/penBindings.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.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): 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 LGPL or the GPL. 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 ***** -->
-
-<bindings id="penBindings"
-   xmlns="http://www.mozilla.org/xbl"
-   xmlns:html="http://www.w3.org/1999/xhtml"
-   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-   
-  <binding id="penButton" extends="chrome://global/content/bindings/button.xml#button-base">
-    <content>
-  	  <xul:box class="button-internal-box" orient="vertical" flex="1" style="-moz-box-align:center;">
-        <xul:spacer flex="1"/>
-        <xul:image class="button-icon" inherits="src"/>
-        <xul:spacer flex="1"/>
-      </xul:box>
-    </content>
-  </binding>    
-</bindings>  
diff --git a/calendar/resources/content/timepicker/timepicker.js b/calendar/resources/content/timepicker/timepicker.js
index c3c9d5776227..4f51c05a291d 100644
--- a/calendar/resources/content/timepicker/timepicker.js
+++ b/calendar/resources/content/timepicker/timepicker.js
@@ -52,11 +52,6 @@
     <popup  id="oe-time-picker-popup"  oncommand="yourCommandFunction( this )" >
     </popup>
 * 
-* Attach the time picker to an item using the popup attribute, an image for example:
-* 
-      <image class="four-state-image-button" popup="oe-time-picker-popup" onmousedown="yourPrepareTimePickerFunction()"  />
- 
-* 
 * In your .js, initialize the picker with the inital time when the user clicks, set to now in this example:
 * 
       function yourPrepareTimePickerFunction( )
diff --git a/calendar/resources/content/unifinder/unifinder.js b/calendar/resources/content/unifinder.js
similarity index 96%
rename from calendar/resources/content/unifinder/unifinder.js
rename to calendar/resources/content/unifinder.js
index 72e5c0371636..e47481c19323 100644
--- a/calendar/resources/content/unifinder/unifinder.js
+++ b/calendar/resources/content/unifinder.js
@@ -21,6 +21,7 @@
  * Contributor(s): Garth Smedley <garths@oeone.com>
  *                 Mike Potter <mikep@oeone.com>
  *                 Chris Charabaruk <coldacid@meldstar.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
@@ -93,24 +94,6 @@ function unifinderInit( CalendarWindow )
 }
 
 
-function unifinderSelectTab( tabid )
-{
-    var unifinderList = document.getElementsByTagName("unifinder");
-    
-    if( unifinderList.length > 0 )
-    {
-        var unifinder = unifinderList[0];
-        
-        var newTab = document.getElementById( tabid );
-        
-        if( newTab )
-        {
-            unifinder.selectedTab = newTab;
-        }
-    }
-}
-
-
 var gSearchEventTable = new Array();
 
 var gDateFormater = new DateFormater();
@@ -177,16 +160,6 @@ function prepareCalendarUnifinder( eventSource )
 }
 
 
-/**
-*   Called when the calendar is unloaded
-*/
-
-function finishCalendarUnifinder( eventSource )
-{
-//   eventSource.removeObserver( unifinderEventDataSourceObserver  );
-}
-
-
 /**
 *   Helper function to display event dates in the unifinder
 */
diff --git a/calendar/resources/content/unifinder/unifinderBindings.xml b/calendar/resources/content/unifinder/unifinderBindings.xml
deleted file mode 100644
index 064a443a387e..000000000000
--- a/calendar/resources/content/unifinder/unifinderBindings.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.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> 
-   -
-   - 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 LGPL or the GPL. 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 ***** -->
-
-<!DOCTYPE window [
-    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd1;
-]>
-
-<bindings id="unifinderBindings"
-          xmlns="http://www.mozilla.org/xbl"
-          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-
-  <binding id="unifinder-base">
-    <resources>
-      <stylesheet src="chrome://calendar/skin/unifinder/unifinder.css"/>
-    </resources>
-  </binding>
-
-  <binding id="unifinder" extends="chrome://calendar/content/unifinder/unifinderBindings.xml#unifinder-base">
-    <content orient="vertical">
-      <xul:box orient="vertical" class="unifinder-internal-box" flex="1" >
-        <xul:box orient="horizontal" class="unifinder-top-box"  >
-          <xul:toolbox class="unifinder-toolbox"  flex="1">
-            <xul:toolbar id="unifinder-toolbar" class="chromeclass-toolbar" flex="1">
-                <xul:box>
-                    <children includes="unifinder-button" />
-                </xul:box>
-                <spacer flex="1"/>
-            </xul:toolbar>
-          </xul:toolbox>
-        </xul:box>
-        <children />
-      </xul:box>
-    </content>
-    <implementation>
-      <property name="selectedTab">
-        <setter>
-        <![CDATA[
-          var tabsItem = this.getTabsItem();
-          
-          if( tabsItem )
-          {
-               tabsItem.selectedTab = val;
-               return val;
-           }
-           else
-           {
-               return null;
-           }
-        ]]>
-        </setter>
-        
-        <getter>
-        <![CDATA[
-          var tabsItem = this.getTabsItem();
-          
-          if( tabsItem )
-          {
-               return tabsItem.selectedTab;
-           }
-           else
-           {
-               return null;
-           }
-        ]]>
-        </getter>
-      </property>
-      
-        <method name="getTabsItem">
-            <body>
-            <![CDATA[
-              var tabsList = document.getElementsByTagName( "tabs" );
-              
-              for( var i = 0; i < tabsList.length; ++i )
-              {
-                if( this ===  tabsList[i].parentNode )
-                    return tabsList[i];
-              }
-              
-              return null;
-            ]]>
-            </body>
-        </method>
-      
-    </implementation>
-  </binding>
-
-  <binding id="unifinder-search-controls" extends="chrome://calendar/content/unifinder/unifinderBindings.xml#unifinder-base">
-    <content orient="horizontal">
-        <xul:hbox align="center" flex="1">
-            <xul:label for="unifinder-search-field" value="&calendar.search.options.searchfor;" />
-            <xul:textbox id="unifinder-search-field" 
-                     inherits="onkeypress=keypressfunction" flex="1"/>  
-        </xul:hbox>
-    </content>
-  </binding>
-
-  <binding id="unifinder-button-base" extends="xul:button">
-    <resources>
-      <stylesheet src="chrome://calendar/skin/unifinder/unifinder.css"/>
-    </resources>
-    <content orient="vertical">
-        <xul:unifinder-image-button class="unifinder-button-image"  unifinder-button-part="button"   /> 
-        <xul:label class="unifinder-button-text" inherits="value=label,accesskey,crop,dragover-top"/>
-    </content>
-  </binding>
-</bindings>          
-
diff --git a/calendar/resources/content/unifinder/unifinderOverlay.xul b/calendar/resources/content/unifinder/unifinderOverlay.xul
deleted file mode 100644
index 39c71f9d5757..000000000000
--- a/calendar/resources/content/unifinder/unifinderOverlay.xul
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.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>
-   -
-   - 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 LGPL or the GPL. 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 ***** -->
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
-
-<!-- CSS File with all styles specific to the unifinder -->
-<?xml-stylesheet href="chrome://calendar/skin/unifinder/unifinder.css" ?>
-
-<!-- DTD File with all strings specific to the unifinder -->
-<!DOCTYPE window 
-[
-    <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd" > %dtd1;
-	 <!ENTITY % dtd3 SYSTEM "chrome://calendar/locale/calendar.dtd" > %dtd3;
-]>
-
-<overlay
-   id="unifinder-overlay"
-   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
-   
-<!-- Javascript includes -->
-
-
-
-   <unifinder id="calendar-unifinder-overlay" flex="1">
-   
-        <unifinder-button id="unifinder-remove-button" observes="delete_command" class="unifinder-remove-button" tooltip="aTooltip" tooltiptext="&calendar.tools.delete.tooltip;" label="&calendar.delete.label;" oncommand="unifinderRemoveCommand()" />
-        <unifinder-button id="unifinder-modify-button" observes="modify_command" class="unifinder-modify-button" tooltip="aTooltip" tooltiptext="&calendar.tools.modify.tooltip;" label="&calendar.modify.label;" oncommand="unifinderModifyCommand()" />
- 
-        <box flex="1">
-            <tabbox class="unifinder-tab-box" unifinder-tab-box="true" orient="vertical" flex="1" >
-                <tabs class="unifinder-tab">
-                    <tab label="&calendar.main.tab.label;" />
-                    <tab label="&calendar.search.tab.label;" />
-                </tabs>
-                
-                <tabpanels orient="horizontal" flex="1">
-                    <vbox id="unifinder-categories-box" flex="1">
-                       <vbox id="unifinder-categories-content-box" flex="1"  >
-                           <listbox id="unifinder-categories-tree" seltype="multiple" onselect="unifinderClickEvent( this )" class="unifinder-tree-class"  flex="1"/>
-                       </vbox>
-                    </vbox>
-            
-                    <vbox flex="1">
-                        <unifinder-search-controls keypressfunction="unifinderSearchKeyPress( this, event )" />
-                        
-                        <listbox id="unifinder-search-results-tree" seltype="multiple" onselect="unifinderClickEvent( this )" class="unifinder-tree-class"  flex="1"/>
-                    </vbox>
-                    
-                </tabpanels>
-            </tabbox>
-        </box>
-   </unifinder>     
-
-  </overlay>
diff --git a/calendar/resources/content/unifinder/unifinderxul.css b/calendar/resources/content/unifinder/unifinderxul.css
deleted file mode 100644
index 93bb47c1e956..000000000000
--- a/calendar/resources/content/unifinder/unifinderxul.css
+++ /dev/null
@@ -1,54 +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>
- *
- * 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 *******/
-
-unifinder { 
-  -moz-binding: url("chrome://calendar/content/unifinder/unifinderBindings.xml#unifinder");
-}
-
-unifinder-search-controls { 
-  -moz-binding: url("chrome://calendar/content/unifinder/unifinderBindings.xml#unifinder-search-controls");
-}
-  
-unifinder-button{ 
-  -moz-binding: url("chrome://calendar/content/unifinder/unifinderBindings.xml#unifinder-button-base");
-}
-
-unifinder-image-button{
-   -moz-binding        	: url("chrome://calendar/content/penBindings.xml#penButton");
-}
\ No newline at end of file
diff --git a/calendar/resources/jar.mn b/calendar/resources/jar.mn
index ca1889731da3..a521f3b45fd9 100644
--- a/calendar/resources/jar.mn
+++ b/calendar/resources/jar.mn
@@ -19,16 +19,12 @@ calendar.jar:
 	 content/calendar/calendarMail.js (content/calendarMail.js)
     content/calendar/contents.rdf (content/contents.rdf)
     content/calendar/dateUtils.js (content/dateUtils.js)
-    content/calendar/penBindings.xml (content/penBindings.xml)
     content/calendar/sound.wav (content/sound.wav)
     content/calendar/datepicker/datepicker-overlay.xul (content/datepicker/datepicker-overlay.xul)
     content/calendar/datepicker/datepicker.js (content/datepicker/datepicker.js)
     content/calendar/timepicker/timepicker-overlay.xul (content/timepicker/timepicker-overlay.xul)
     content/calendar/timepicker/timepicker.js (content/timepicker/timepicker.js)
-    content/calendar/unifinder/unifinder.js (content/unifinder/unifinder.js)
-    content/calendar/unifinder/unifinderBindings.xml (content/unifinder/unifinderBindings.xml)
-    content/calendar/unifinder/unifinderOverlay.xul (content/unifinder/unifinderOverlay.xul)
-    content/calendar/unifinder/unifinderxul.css (content/unifinder/unifinderxul.css)
+    content/calendar/unifinder.js (content/unifinder.js)
     content/calendar/pref/calendarPrefOverlay.xul (content/pref/calendarPrefOverlay.xul)
     content/calendar/pref/rootCalendarPref.js (content/pref/rootCalendarPref.js)
     content/calendar/pref/calendarPref.js (content/pref/calendarPref.js)
@@ -101,15 +97,15 @@ calendar.jar:
     skin/modern/calendar/datepicker/right_arrow.png (skin/modern/datepicker/right_arrow.png)
     skin/modern/calendar/timepicker/time_picker_minutes_bottom.png (skin/modern/timepicker/time_picker_minutes_bottom.png)
     skin/modern/calendar/timepicker/timepicker.css (skin/modern/timepicker/timepicker.css)
-    skin/modern/calendar/unifinder/modify_disabled.png (skin/modern/unifinder/modify_disabled.png)
-    skin/modern/calendar/unifinder/modify_down.png (skin/modern/unifinder/modify_down.png)
-    skin/modern/calendar/unifinder/modify_hover.png (skin/modern/unifinder/modify_hover.png)
-    skin/modern/calendar/unifinder/modify_up.png (skin/modern/unifinder/modify_up.png)
-    skin/modern/calendar/unifinder/remove_disabled.png (skin/modern/unifinder/remove_disabled.png)
-    skin/modern/calendar/unifinder/remove_down.png (skin/modern/unifinder/remove_down.png)
-    skin/modern/calendar/unifinder/remove_hover.png (skin/modern/unifinder/remove_hover.png)
-    skin/modern/calendar/unifinder/remove_up.png (skin/modern/unifinder/remove_up.png)
-    skin/modern/calendar/unifinder/unifinder.css (skin/modern/unifinder/unifinder.css)
+    skin/modern/calendar/modify_disabled.png (skin/modern/modify_disabled.png)
+    skin/modern/calendar/modify_down.png (skin/modern/modify_down.png)
+    skin/modern/calendar/modify_hover.png (skin/modern/modify_hover.png)
+    skin/modern/calendar/modify_up.png (skin/modern/modify_up.png)
+    skin/modern/calendar/remove_disabled.png (skin/modern/remove_disabled.png)
+    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)
@@ -170,12 +166,12 @@ calendar.jar:
     skin/classic/calendar/datepicker/right_arrow.png (skin/classic/datepicker/right_arrow.png)
     skin/classic/calendar/timepicker/time_picker_minutes_bottom.png (skin/classic/timepicker/time_picker_minutes_bottom.png)
     skin/classic/calendar/timepicker/timepicker.css (skin/classic/timepicker/timepicker.css)
-    skin/classic/calendar/unifinder/modify_disabled.png (skin/classic/unifinder/modify_disabled.png)
-    skin/classic/calendar/unifinder/modify_down.png (skin/classic/unifinder/modify_down.png)
-    skin/classic/calendar/unifinder/modify_hover.png (skin/classic/unifinder/modify_hover.png)
-    skin/classic/calendar/unifinder/modify_up.png (skin/classic/unifinder/modify_up.png)
-    skin/classic/calendar/unifinder/remove_disabled.png (skin/classic/unifinder/remove_disabled.png)
-    skin/classic/calendar/unifinder/remove_down.png (skin/classic/unifinder/remove_down.png)
-    skin/classic/calendar/unifinder/remove_hover.png (skin/classic/unifinder/remove_hover.png)
-    skin/classic/calendar/unifinder/remove_up.png (skin/classic/unifinder/remove_up.png)
-    skin/classic/calendar/unifinder/unifinder.css (skin/classic/unifinder/unifinder.css)
+    skin/classic/calendar/modify_disabled.png (skin/classic/modify_disabled.png)
+    skin/classic/calendar/modify_down.png (skin/classic/modify_down.png)
+    skin/classic/calendar/modify_hover.png (skin/classic/modify_hover.png)
+    skin/classic/calendar/modify_up.png (skin/classic/modify_up.png)
+    skin/classic/calendar/remove_disabled.png (skin/classic/remove_disabled.png)
+    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/calendar/resources/skin/classic/calendar.css b/calendar/resources/skin/classic/calendar.css
index 0f86c4dfeb10..6d465d9e5df4 100644
--- a/calendar/resources/skin/classic/calendar.css
+++ b/calendar/resources/skin/classic/calendar.css
@@ -69,27 +69,6 @@
    max-height              : 33px;
 }
 
-/*--------------------------------------------------------------------
- *   Button bar vertical divider line
- *-------------------------------------------------------------------*/
-
-.calendar-control-divider
-{
-    list-style-image        : url("chrome://calendar/skin/divider.png");
-}
-
-
-button.calendar-management-button,
-button.calendar-management-button:hover,
-button.calendar-management-button:hover:active
-{
-	margin				  		: 0px;
-	border						: 0px; 
-	 -moz-binding				: url("chrome://calendar/content/penBindings.xml#penButton");
-	-moz-user-focus			: ignore !important;
-	max-height					: 36px;
-}
-
 /*--------------------------------------------------------------------
  *   new event button
  *-------------------------------------------------------------------*/
diff --git a/calendar/resources/skin/classic/unifinder/modify_disabled.png b/calendar/resources/skin/classic/modify_disabled.png
similarity index 100%
rename from calendar/resources/skin/classic/unifinder/modify_disabled.png
rename to calendar/resources/skin/classic/modify_disabled.png
diff --git a/calendar/resources/skin/classic/unifinder/modify_down.png b/calendar/resources/skin/classic/modify_down.png
similarity index 100%
rename from calendar/resources/skin/classic/unifinder/modify_down.png
rename to calendar/resources/skin/classic/modify_down.png
diff --git a/calendar/resources/skin/classic/unifinder/modify_hover.png b/calendar/resources/skin/classic/modify_hover.png
similarity index 100%
rename from calendar/resources/skin/classic/unifinder/modify_hover.png
rename to calendar/resources/skin/classic/modify_hover.png
diff --git a/calendar/resources/skin/classic/unifinder/modify_up.png b/calendar/resources/skin/classic/modify_up.png
similarity index 100%
rename from calendar/resources/skin/classic/unifinder/modify_up.png
rename to calendar/resources/skin/classic/modify_up.png
diff --git a/calendar/resources/skin/classic/unifinder/remove_disabled.png b/calendar/resources/skin/classic/remove_disabled.png
similarity index 100%
rename from calendar/resources/skin/classic/unifinder/remove_disabled.png
rename to calendar/resources/skin/classic/remove_disabled.png
diff --git a/calendar/resources/skin/classic/unifinder/remove_down.png b/calendar/resources/skin/classic/remove_down.png
similarity index 100%
rename from calendar/resources/skin/classic/unifinder/remove_down.png
rename to calendar/resources/skin/classic/remove_down.png
diff --git a/calendar/resources/skin/classic/unifinder/remove_hover.png b/calendar/resources/skin/classic/remove_hover.png
similarity index 100%
rename from calendar/resources/skin/classic/unifinder/remove_hover.png
rename to calendar/resources/skin/classic/remove_hover.png
diff --git a/calendar/resources/skin/classic/unifinder/remove_up.png b/calendar/resources/skin/classic/remove_up.png
similarity index 100%
rename from calendar/resources/skin/classic/unifinder/remove_up.png
rename to calendar/resources/skin/classic/remove_up.png
diff --git a/calendar/resources/skin/classic/unifinder.css b/calendar/resources/skin/classic/unifinder.css
new file mode 100644
index 000000000000..dc12c02d36cd
--- /dev/null
+++ b/calendar/resources/skin/classic/unifinder.css
@@ -0,0 +1,136 @@
+/* ***** 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/calendar/resources/skin/classic/unifinder/unifinder.css b/calendar/resources/skin/classic/unifinder/unifinder.css
deleted file mode 100644
index 780eaab472ce..000000000000
--- a/calendar/resources/skin/classic/unifinder/unifinder.css
+++ /dev/null
@@ -1,177 +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>
- *
- * 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 ***** */
-
-toolbarseparator { 
-  margin: 0px 0.2em;
-  border-right: 1px solid #ffffff;
-  width: 0px;
-}
-
-#unifinder-toolbar
-{
-	height: 33px !important;
-}
-
-/* ::::: tabpanels ::::: */
-
-tabpanels {
-   border: none;
-}
-
-
-/*--------------------------------------------------------------------
- * Style for image buttons - Override a couple of settings
- *      in the normal buttontop
- *-------------------------------------------------------------------*/
-  
-.four-state-image-button
-{
-   -moz-binding        : url("chrome://calendar/content/penBindings.xml#penButton");
-   margin              : 0px;
-   border              : 0px;
-   -moz-user-focus     : ignore !important;
-}
-
-.unifinder-tab-box
-{
-   margin-top             : 4px 
-}
-
-/* The top box has the icons in it */
-
-.unifinder-top-box
-{
-	overflow: never;
-   margin-bottom          : 1px;
-}
-
-/* :SIGH: override the tree selection from tree.css, wish there was a better way */
-
-.unifinder-tree-class > listitem[selected="true"] 
-{
-   background-color     : white;
-   color                : black;
-   border-top           : none;
-   border-left          : none;
-   border-right         : none;
-   border-bottom        : 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;
-}
-
-/*--------------------------------------------------------------------
- *   unifinder modify to button
- *-------------------------------------------------------------------*/
-
-.unifinder-modify-button  > .unifinder-button-image
-  {
-    list-style-image        : url("chrome://calendar/skin/unifinder/modify_up.png");
-  }
-.unifinder-modify-button[disabled="true"] > .unifinder-button-image,
-.unifinder-modify-button[disabled="true"]:hover > .unifinder-button-image,
-.unifinder-modify-button[disabled="true"]:hover:active > .unifinder-button-image
-  {
-   list-style-image         : url("chrome://calendar/skin/unifinder/modify_disabled.png");
-  }
-.unifinder-modify-button:hover > .unifinder-button-image
-  {
-    list-style-image        : url("chrome://calendar/skin/unifinder/modify_hover.png");
-  }
-.unifinder-modify-button:hover:active > .unifinder-button-image
-  {
-    list-style-image        : url("chrome://calendar/skin/unifinder/modify_down.png");
-  }
-
-/*--------------------------------------------------------------------
- *   unifinder remove button
- *-------------------------------------------------------------------*/
-
-.unifinder-remove-button > .unifinder-button-image
-  {
-    list-style-image        : url("chrome://calendar/skin/unifinder/remove_up.png");
-  }
-  
-.unifinder-remove-button[disabled="true"] > .unifinder-button-image,
-.unifinder-remove-button[disabled="true"]:hover > .unifinder-button-image,
-.unifinder-remove-button[disabled="true"]:hover:active > .unifinder-button-image
-  {
-   list-style-image         : url("chrome://calendar/skin/unifinder/remove_disabled.png");
-  }
-
-.unifinder-remove-button:hover > .unifinder-button-image
-  {
-    list-style-image        : url("chrome://calendar/skin/unifinder/remove_hover.png");
-  }
-
-.unifinder-remove-button:hover:active > .unifinder-button-image
-  {
-    list-style-image        : url("chrome://calendar/skin/unifinder/remove_down.png");
-  }
-  
-.unifinder-button-text
-{
-        font-family             : helvetica;
-        font-size               : 10pt;
-        color                   : #323642;
-}
-
-.unifinder-remove-button[disabled="true"] .unifinder-button-text,
-.unifinder-remove-button[disabled="true"]:hover .unifinder-button-text,
-.unifinder-remove-button[disabled="true"]:hover:active .unifinder-button-text,
-.unifinder-modify-button[disabled="true"] .unifinder-button-text,
-.unifinder-modify-button[disabled="true"]:hover .unifinder-button-text,
-.unifinder-modify-button[disabled="true"]:hover:active .unifinder-button-text
-{
-		color: #9399AB !important;
-}
-
diff --git a/calendar/resources/skin/modern/calendar.css b/calendar/resources/skin/modern/calendar.css
index 248a29d10017..7a1754ea4778 100644
--- a/calendar/resources/skin/modern/calendar.css
+++ b/calendar/resources/skin/modern/calendar.css
@@ -69,27 +69,6 @@
    max-height              : 33px;
 }
 
-/*--------------------------------------------------------------------
- *   Button bar vertical divider line
- *-------------------------------------------------------------------*/
-
-.calendar-control-divider
-{
-    list-style-image        : url("chrome://calendar/skin/divider.png");
-}
-
-
-button.calendar-management-button,
-button.calendar-management-button:hover,
-button.calendar-management-button:hover:active
-{
-	margin				  		: 0px;
-	border						: 0px; 
-	 -moz-binding				: url("chrome://calendar/content/penBindings.xml#penButton");
-	-moz-user-focus			: ignore !important;
-	max-height					: 36px;
-}
-
 /*--------------------------------------------------------------------
  *   new event button
  *-------------------------------------------------------------------*/
diff --git a/calendar/resources/skin/modern/unifinder/modify_disabled.png b/calendar/resources/skin/modern/modify_disabled.png
similarity index 100%
rename from calendar/resources/skin/modern/unifinder/modify_disabled.png
rename to calendar/resources/skin/modern/modify_disabled.png
diff --git a/calendar/resources/skin/modern/unifinder/modify_down.png b/calendar/resources/skin/modern/modify_down.png
similarity index 100%
rename from calendar/resources/skin/modern/unifinder/modify_down.png
rename to calendar/resources/skin/modern/modify_down.png
diff --git a/calendar/resources/skin/modern/unifinder/modify_hover.png b/calendar/resources/skin/modern/modify_hover.png
similarity index 100%
rename from calendar/resources/skin/modern/unifinder/modify_hover.png
rename to calendar/resources/skin/modern/modify_hover.png
diff --git a/calendar/resources/skin/modern/unifinder/modify_up.png b/calendar/resources/skin/modern/modify_up.png
similarity index 100%
rename from calendar/resources/skin/modern/unifinder/modify_up.png
rename to calendar/resources/skin/modern/modify_up.png
diff --git a/calendar/resources/skin/modern/unifinder/remove_disabled.png b/calendar/resources/skin/modern/remove_disabled.png
similarity index 100%
rename from calendar/resources/skin/modern/unifinder/remove_disabled.png
rename to calendar/resources/skin/modern/remove_disabled.png
diff --git a/calendar/resources/skin/modern/unifinder/remove_down.png b/calendar/resources/skin/modern/remove_down.png
similarity index 100%
rename from calendar/resources/skin/modern/unifinder/remove_down.png
rename to calendar/resources/skin/modern/remove_down.png
diff --git a/calendar/resources/skin/modern/unifinder/remove_hover.png b/calendar/resources/skin/modern/remove_hover.png
similarity index 100%
rename from calendar/resources/skin/modern/unifinder/remove_hover.png
rename to calendar/resources/skin/modern/remove_hover.png
diff --git a/calendar/resources/skin/modern/unifinder/remove_up.png b/calendar/resources/skin/modern/remove_up.png
similarity index 100%
rename from calendar/resources/skin/modern/unifinder/remove_up.png
rename to calendar/resources/skin/modern/remove_up.png
diff --git a/calendar/resources/skin/modern/unifinder.css b/calendar/resources/skin/modern/unifinder.css
new file mode 100644
index 000000000000..4efe0f69620f
--- /dev/null
+++ b/calendar/resources/skin/modern/unifinder.css
@@ -0,0 +1,149 @@
+/* ***** 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");
+}
+
diff --git a/calendar/resources/skin/modern/unifinder/unifinder.css b/calendar/resources/skin/modern/unifinder/unifinder.css
deleted file mode 100644
index de8220455a9e..000000000000
--- a/calendar/resources/skin/modern/unifinder/unifinder.css
+++ /dev/null
@@ -1,204 +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>
- *
- * 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 ***** */
-
-toolbarseparator { 
-  margin: 0px 0.2em;
-  border-right: 1px solid #ffffff;
-  width: 0px;
-}
-
-#unifinder-toolbar
-{
-	height: 33px !important;
-   background-color       : #dde3eb;
-}
-
-/* ::::: tabpanels ::::: */
-
-tabpanels {
-   border: none;
-}
-
-
-/*--------------------------------------------------------------------
- * Style for image buttons - Override a couple of settings
- *      in the normal buttontop
- *-------------------------------------------------------------------*/
-  
-.four-state-image-button
-{
-   -moz-binding        : url("chrome://calendar/content/penBindings.xml#penButton");
-   margin              : 0px;
-   border              : 0px;
-   -moz-user-focus     : ignore !important;
-}
-
-.unifinder-tab-box
-{
-   margin-top             : 4px 
-}
-
-/* The top box has the icons in it */
-
-.unifinder-top-box
-{
-	overflow: never;
-   margin-bottom          : 1px;
-}
-
-/* :SIGH: override the tree selection from tree.css, wish there was a better way */
-
-.unifinder-tree-class > listitem[selected="true"] 
-{
-   background-color     : white;
-   color                : black;
-   border-top           : none;
-   border-left          : none;
-   border-right         : none;
-   border-bottom        : 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;
-}
-
-/*--------------------------------------------------------------------
- *   unifinder modify to button
- *-------------------------------------------------------------------*/
-
-.unifinder-modify-button  > .unifinder-button-image
-  {
-    list-style-image        : url("chrome://calendar/skin/unifinder/modify_up.png");
-  }
-.unifinder-modify-button[disabled="true"] > .unifinder-button-image,
-.unifinder-modify-button[disabled="true"]:hover > .unifinder-button-image,
-.unifinder-modify-button[disabled="true"]:hover:active > .unifinder-button-image
-  {
-   list-style-image         : url("chrome://calendar/skin/unifinder/modify_disabled.png");
-  }
-.unifinder-modify-button:hover > .unifinder-button-image
-  {
-    list-style-image        : url("chrome://calendar/skin/unifinder/modify_hover.png");
-  }
-.unifinder-modify-button:hover:active > .unifinder-button-image
-  {
-    list-style-image        : url("chrome://calendar/skin/unifinder/modify_down.png");
-  }
-
-/*--------------------------------------------------------------------
- *   unifinder remove button
- *-------------------------------------------------------------------*/
-
-.unifinder-remove-button > .unifinder-button-image
-  {
-	 background-color			 : #DDE3EB;
-    list-style-image        : url("chrome://calendar/skin/unifinder/remove_up.png");
-  }
-  
-.unifinder-remove-button[disabled="true"] > .unifinder-button-image,
-.unifinder-remove-button[disabled="true"]:hover > .unifinder-button-image,
-.unifinder-remove-button[disabled="true"]:hover:active > .unifinder-button-image
-  {
-	 background-color			 : #DDE3EB;
-   list-style-image         : url("chrome://calendar/skin/unifinder/remove_disabled.png");
-  }
-
-.unifinder-remove-button:hover > .unifinder-button-image
-  {
-	 background-color			 : #EAEEF6;
-    list-style-image        : url("chrome://calendar/skin/unifinder/remove_hover.png");
-  }
-
-.unifinder-remove-button:hover:active > .unifinder-button-image
-  {
-	 background-color			 : #CBD9E8;
-    list-style-image        : url("chrome://calendar/skin/unifinder/remove_down.png");
-  }
-  
-.unifinder-remove-button,
-.unifinder-remove-button[disabled="true"],
-.unifinder-remove-button[disabled="true"]:hover,
-.unifinder-remove-button[disabled="true"]:hover:active,
-.unifinder-modify-button,
-.unifinder-modify-button[disabled="true"],
-.unifinder-modify-button[disabled="true"]:hover,
-.unifinder-modify-button[disabled="true"]:hover:active
-  {
-	 background-color			 : #DDE3EB;
-  }
-.unifinder-remove-button:hover,
-.unifinder-modify-button:hover
-  {
-	 background-color			 : #EAEEF6;
-  }
-.unifinder-remove-button:hover:active,
-.unifinder-modify-button:hover:active
-  {
-	 background-color			 : #CBD9E8;
-  }
-
-.unifinder-button-text
-{
-        font-family             : helvetica;
-        font-size               : 10pt;
-        color                   : #323642;
-}
-
-.unifinder-remove-button[disabled="true"] .unifinder-button-text,
-.unifinder-remove-button[disabled="true"]:hover .unifinder-button-text,
-.unifinder-remove-button[disabled="true"]:hover:active .unifinder-button-text,
-.unifinder-modify-button[disabled="true"] .unifinder-button-text,
-.unifinder-modify-button[disabled="true"]:hover .unifinder-button-text,
-.unifinder-modify-button[disabled="true"]:hover:active .unifinder-button-text
-{
-		color: #9399AB !important;
-}
-