diff --git a/livesupport/modules/widgets/include/LiveSupport/Widgets/WidgetFactory.h b/livesupport/modules/widgets/include/LiveSupport/Widgets/WidgetFactory.h
index 550649446..41e3ef2d7 100644
--- a/livesupport/modules/widgets/include/LiveSupport/Widgets/WidgetFactory.h
+++ b/livesupport/modules/widgets/include/LiveSupport/Widgets/WidgetFactory.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.20 $
+    Version  : $Revision: 1.21 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/include/LiveSupport/Widgets/WidgetFactory.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -89,7 +89,7 @@ class ZebraTreeView;
  *  </code></pre>
  *
  *  @author  $Author: fgerlits $
- *  @version $Revision: 1.20 $
+ *  @version $Revision: 1.21 $
  */
 class WidgetFactory :
                         virtual public Configurable
@@ -117,7 +117,8 @@ class WidgetFactory :
                        scratchpadWindowTitleImage,
                        searchWindowTitleImage,
                        liveModeWindowTitleImage,
-                       playlistsWindowTitleImage }
+                       playlistsWindowTitleImage,
+                       schedulerWindowTitleImage }
                                                     ImageType;
 
 
diff --git a/livesupport/modules/widgets/src/WidgetFactory.cxx b/livesupport/modules/widgets/src/WidgetFactory.cxx
index 814b739a4..65bb6b2fa 100644
--- a/livesupport/modules/widgets/src/WidgetFactory.cxx
+++ b/livesupport/modules/widgets/src/WidgetFactory.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.22 $
+    Version  : $Revision: 1.23 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/widgets/src/WidgetFactory.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -267,6 +267,12 @@ static const std::string    liveModeWindowTitleImageName
 static const std::string    playlistsWindowTitleImageName 
                             = "titleImages/playlistsWindowTitle.png";
 
+/**
+ *  The name of the image for the title of the scheduler window.
+ */
+static const std::string    schedulerWindowTitleImageName 
+                            = "titleImages/schedulerWindowTitle.png";
+
 
 /* ===============================================  local function prototypes */
 
@@ -510,6 +516,10 @@ WidgetFactory :: createImage(ImageType  imageName)              throw ()
             rawImage = loadImage(playlistsWindowTitleImageName);
             break;
 
+        case schedulerWindowTitleImage:
+            rawImage = loadImage(schedulerWindowTitleImageName);
+            break;
+
         default:
             return 0;
     }
diff --git a/livesupport/products/gLiveSupport/src/SchedulerWindow.cxx b/livesupport/products/gLiveSupport/src/SchedulerWindow.cxx
index 5d45b1688..56eb132bf 100644
--- a/livesupport/products/gLiveSupport/src/SchedulerWindow.cxx
+++ b/livesupport/products/gLiveSupport/src/SchedulerWindow.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.7 $
+    Version  : $Revision: 1.8 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SchedulerWindow.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -63,12 +63,13 @@ using namespace LiveSupport::GLiveSupport;
 SchedulerWindow :: SchedulerWindow (Ptr<GLiveSupport>::Ref      gLiveSupport,
                                     Ptr<ResourceBundle>::Ref    bundle)
                                                                     throw ()
-                    : LocalizedObject(bundle)
+          : WhiteWindow(WidgetFactory::schedulerWindowTitleImage,
+                        Colors::White,
+                        WidgetFactory::getInstance()->getWhiteWindowCorners()),
+            LocalizedObject(bundle),
+            gLiveSupport(gLiveSupport)
 {
-    this->gLiveSupport = gLiveSupport;
-
     try {
-        set_title(*getResourceUstring("windowTitle"));
         closeButton = Gtk::manage(new Gtk::Button(
                                     *getResourceUstring("closeButtonLabel")));
     } catch (std::invalid_argument &e) {
@@ -134,7 +135,9 @@ SchedulerWindow :: SchedulerWindow (Ptr<GLiveSupport>::Ref      gLiveSupport,
     // initialize the selected date for today
     selectedDate.reset(new gregorian::date(TimeConversion::now()->date()));
 
-    add(*layout);
+    Gtk::VBox *         mainBox = Gtk::manage(new Gtk::VBox);
+    mainBox->add(*layout);
+    add(*mainBox);
 
     show_all();
 
diff --git a/livesupport/products/gLiveSupport/src/SchedulerWindow.h b/livesupport/products/gLiveSupport/src/SchedulerWindow.h
index 9369de0ff..35f000ed9 100644
--- a/livesupport/products/gLiveSupport/src/SchedulerWindow.h
+++ b/livesupport/products/gLiveSupport/src/SchedulerWindow.h
@@ -21,8 +21,8 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  
  
-    Author   : $Author: maroy $
-    Version  : $Revision: 1.3 $
+    Author   : $Author: fgerlits $
+    Version  : $Revision: 1.4 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/gLiveSupport/src/SchedulerWindow.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -50,6 +50,7 @@
 
 #include "LiveSupport/Core/Ptr.h"
 #include "LiveSupport/Core/LocalizedObject.h"
+#include "LiveSupport/Widgets/WhiteWindow.h"
 #include "GLiveSupport.h"
 
 namespace LiveSupport {
@@ -87,10 +88,10 @@ using namespace LiveSupport::Core;
  *  +-------------------------------------------------+
  *  </pre></code>
  *
- *  @author $Author: maroy $
- *  @version $Revision: 1.3 $
+ *  @author $Author: fgerlits $
+ *  @version $Revision: 1.4 $
  */
-class SchedulerWindow : public Gtk::Window, public LocalizedObject
+class SchedulerWindow : public WhiteWindow, public LocalizedObject
 {
 
     protected:
@@ -99,8 +100,8 @@ class SchedulerWindow : public Gtk::Window, public LocalizedObject
          *  The columns model needed by Gtk::TreeView.
          *  Lists one scheduled item per row.
          *
-         *  @author $Author: maroy $
-         *  @version $Revision: 1.3 $
+         *  @author $Author: fgerlits $
+         *  @version $Revision: 1.4 $
          */
         class ModelColumns : public Gtk::TreeModel::ColumnRecord
         {