diff --git a/ChangeLog b/ChangeLog
index 9907d5a23..cf3e24363 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-07-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Common/UIxToolbarSeparator.m, UI/Common/UIxToolbarButton.m:
+	new toolbar objects.
+
 	* UI/Templates/UIxPageFrame.wox: use the exact html code as below.
 
 	* UI/Templates/MailerUI/UIxMailMainFrame.wox: redone the
diff --git a/UI/Common/GNUmakefile b/UI/Common/GNUmakefile
index 3f508815f..cd2d55be0 100644
--- a/UI/Common/GNUmakefile
+++ b/UI/Common/GNUmakefile
@@ -19,7 +19,9 @@ CommonUI_OBJC_FILES +=		\
 	UIxElemBuilder.m	\
 	UIxTabView.m		\
 	UIxTabItem.m		\
-
+	\
+	UIxToolbarButton.m	\
+	UIxToolbarSeparator.m
 
 CommonUI_RESOURCE_FILES += \
 	Version			\
diff --git a/UI/Common/UIxToolbarButton.m b/UI/Common/UIxToolbarButton.m
new file mode 100644
index 000000000..0a7fc3514
--- /dev/null
+++ b/UI/Common/UIxToolbarButton.m
@@ -0,0 +1,113 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSString.h>
+
+#import <SOGoUI/UIxComponent.h>
+
+@interface UIxToolbarButton : UIxComponent
+{
+  NSString *buttonImage;
+  NSString *buttonLabel;
+  NSString *buttonLink;
+  NSString *buttonTooltip;
+}
+
+- (void) setButtonImage: (NSString *) newButtonImage;
+- (NSString *) buttonImage;
+
+- (void) setButtonLabel: (NSString *) newButtonLabel;
+- (NSString *) buttonLabel;
+
+- (void) setButtonLink: (NSString *) newButtonLink;
+- (NSString *) buttonLink;
+
+- (void) setButtonTooltip: (NSString *) newButtonTooltip;
+- (NSString *) buttonTooltip;
+
+@end
+
+@implementation UIxToolbarButton
+
+
+- (id) init
+{
+  if ((self = [super init]))
+    {
+      buttonImage = nil;
+      buttonLabel = nil;
+      buttonLink = nil;
+      buttonTooltip = nil;
+    }
+
+  return self;
+}
+
+- (void) dealloc
+{
+  if (buttonImage)
+    [buttonImage release];
+  if (buttonLabel)
+    [buttonLabel release];
+  if (buttonLink)
+    [buttonLink release];
+  if (buttonTooltip)
+    [buttonTooltip release];
+  [super dealloc];
+}
+
+- (void) setButtonLabel: (NSString *) newButtonLabel
+{
+  if (buttonLabel)
+    [buttonLabel release];
+  buttonLabel = newButtonLabel;
+  if (buttonLabel)
+    [buttonLabel retain];
+}
+
+- (NSString *) buttonLabel
+{
+  return buttonLabel;
+}
+
+- (void) setButtonImage: (NSString *) newButtonImage
+{
+  if (buttonImage)
+    [buttonImage release];
+  buttonImage = newButtonImage;
+  if (buttonImage)
+    [buttonImage retain];
+}
+
+- (NSString *) buttonImage
+{
+  return buttonImage;
+}
+
+- (void) setButtonLink: (NSString *) newButtonLink
+{
+  if (buttonLink)
+    [buttonLink release];
+  buttonLink = newButtonLink;
+  if (buttonLink)
+    [buttonLink retain];
+}
+
+- (NSString *) buttonLink
+{
+  return [self completeHrefForMethod: buttonLink];
+}
+
+- (void) setButtonTooltip: (NSString *) newButtonTooltip
+{
+  if (buttonTooltip)
+    [buttonTooltip release];
+  buttonTooltip = newButtonTooltip;
+  if (buttonTooltip)
+    [buttonTooltip retain];
+}
+
+- (NSString *) buttonTooltip
+{
+  return buttonTooltip;
+}
+
+@end
diff --git a/UI/Common/UIxToolbarSeparator.m b/UI/Common/UIxToolbarSeparator.m
new file mode 100644
index 000000000..5b3ef5761
--- /dev/null
+++ b/UI/Common/UIxToolbarSeparator.m
@@ -0,0 +1,14 @@
+#import <Foundation/NSObject.h>
+#import <Foundation/NSString.h>
+
+#import <SOGoUI/UIxComponent.h>
+
+@interface UIxToolbarSeparator : UIxComponent
+{
+}
+
+@end
+
+@implementation UIxToolbarSeparator
+
+@end
diff --git a/UI/Scheduler/GNUmakefile b/UI/Scheduler/GNUmakefile
index a4f3fd3ed..bb54b5fa2 100644
--- a/UI/Scheduler/GNUmakefile
+++ b/UI/Scheduler/GNUmakefile
@@ -14,7 +14,6 @@ SchedulerUI_OBJC_FILES =		\
 	NSCalendarDate+UIx.m		\
 	SOGoAppointment+UIx.m		\
 	UIxComponent+Agenor.m		\
-	\
 	UIxCalView.m			\
 	UIxCalDayView.m			\
 	UIxCalWeekView.m		\
@@ -74,6 +73,15 @@ SchedulerUI_RESOURCE_FILES += \
 	images/green_corner.gif			\
 	images/invisible_space_2.gif		\
 	images/apt_icon_private.gif		\
+	images/day-view.png			\
+	images/delete.png			\
+	images/edit.png				\
+	images/goto-today.png			\
+	images/month-view.png			\
+	images/multiweek-view.png		\
+	images/new-event.png			\
+	images/new-task.png			\
+	images/week-view.png
 
 SchedulerUI_LOCALIZED_RESOURCE_FILES += \
 	Localizable.strings		\
diff --git a/UI/Scheduler/images/day-view.png b/UI/Scheduler/images/day-view.png
new file mode 100644
index 000000000..074c2600d
Binary files /dev/null and b/UI/Scheduler/images/day-view.png differ
diff --git a/UI/Scheduler/images/delete.png b/UI/Scheduler/images/delete.png
new file mode 100644
index 000000000..e951de025
Binary files /dev/null and b/UI/Scheduler/images/delete.png differ
diff --git a/UI/Scheduler/images/edit.png b/UI/Scheduler/images/edit.png
new file mode 100644
index 000000000..45f754468
Binary files /dev/null and b/UI/Scheduler/images/edit.png differ
diff --git a/UI/Scheduler/images/goto-today.png b/UI/Scheduler/images/goto-today.png
new file mode 100644
index 000000000..2da10b537
Binary files /dev/null and b/UI/Scheduler/images/goto-today.png differ
diff --git a/UI/Scheduler/images/month-view.png b/UI/Scheduler/images/month-view.png
new file mode 100644
index 000000000..113e21cbe
Binary files /dev/null and b/UI/Scheduler/images/month-view.png differ
diff --git a/UI/Scheduler/images/multiweek-view.png b/UI/Scheduler/images/multiweek-view.png
new file mode 100644
index 000000000..dbf9b9df3
Binary files /dev/null and b/UI/Scheduler/images/multiweek-view.png differ
diff --git a/UI/Scheduler/images/new-event.png b/UI/Scheduler/images/new-event.png
new file mode 100644
index 000000000..d6ac20c7e
Binary files /dev/null and b/UI/Scheduler/images/new-event.png differ
diff --git a/UI/Scheduler/images/new-task.png b/UI/Scheduler/images/new-task.png
new file mode 100644
index 000000000..66355af24
Binary files /dev/null and b/UI/Scheduler/images/new-task.png differ
diff --git a/UI/Scheduler/images/week-view.png b/UI/Scheduler/images/week-view.png
new file mode 100644
index 000000000..eb4703caa
Binary files /dev/null and b/UI/Scheduler/images/week-view.png differ
diff --git a/UI/Templates/UIxCalDayChartview.wox b/UI/Templates/UIxCalDayChartview.wox
index a6f0a21b2..65d643e3e 100644
--- a/UI/Templates/UIxCalDayChartview.wox
+++ b/UI/Templates/UIxCalDayChartview.wox
@@ -7,6 +7,54 @@
                className="UIxPageFrame"
                title="name"
 >
+
+<div class="toolbar">
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new"
+	const:buttonLabel="New Event"
+	rsrc:buttonImage="new-event.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new_task"
+	const:buttonLabel="New Task"
+	rsrc:buttonImage="new-task.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="edit"
+	const:buttonLabel="Edit"
+	rsrc:buttonImage="edit.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="delete"
+	const:buttonLabel="Delete"
+	rsrc:buttonImage="delete.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="today"
+	const:buttonLabel="Go to Today"
+	rsrc:buttonImage="goto-today.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="dayoverview"
+	const:buttonLabel="Day View"
+	rsrc:buttonImage="day-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="weekoverview"
+	const:buttonLabel="Week View"
+	rsrc:buttonImage="week-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="monthoverview"
+	const:buttonLabel="Month View"
+	rsrc:buttonImage="month-view.png" />
+
+</div>
+
   <table id="skywintable"
          class="wintable"
          cellspacing="0"
diff --git a/UI/Templates/UIxCalDayListview.wox b/UI/Templates/UIxCalDayListview.wox
index 1111be3ed..fd7123bf2 100644
--- a/UI/Templates/UIxCalDayListview.wox
+++ b/UI/Templates/UIxCalDayListview.wox
@@ -7,6 +7,54 @@
                className="UIxPageFrame"
                title="name"
 >
+
+<div class="toolbar">
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new"
+	const:buttonLabel="New Event"
+	rsrc:buttonImage="new-event.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new_task"
+	const:buttonLabel="New Task"
+	rsrc:buttonImage="new-task.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="edit"
+	const:buttonLabel="Edit"
+	rsrc:buttonImage="edit.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="delete"
+	const:buttonLabel="Delete"
+	rsrc:buttonImage="delete.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="today"
+	const:buttonLabel="Go to Today"
+	rsrc:buttonImage="goto-today.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="dayoverview"
+	const:buttonLabel="Day View"
+	rsrc:buttonImage="day-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="weekoverview"
+	const:buttonLabel="Week View"
+	rsrc:buttonImage="week-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="monthoverview"
+	const:buttonLabel="Month View"
+	rsrc:buttonImage="month-view.png" />
+
+</div>
+
   <table id="skywintable"
          class="wintable"
          cellspacing="0"
diff --git a/UI/Templates/UIxCalDayOverview.wox b/UI/Templates/UIxCalDayOverview.wox
index 1ab5ea625..5a50e6bfa 100644
--- a/UI/Templates/UIxCalDayOverview.wox
+++ b/UI/Templates/UIxCalDayOverview.wox
@@ -7,6 +7,54 @@
                className="UIxPageFrame"
                title="name"
 >
+
+<div class="toolbar">
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new"
+	const:buttonLabel="New Event"
+	rsrc:buttonImage="new-event.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new_task"
+	const:buttonLabel="New Task"
+	rsrc:buttonImage="new-task.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="edit"
+	const:buttonLabel="Edit"
+	rsrc:buttonImage="edit.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="delete"
+	const:buttonLabel="Delete"
+	rsrc:buttonImage="delete.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="today"
+	const:buttonLabel="Go to Today"
+	rsrc:buttonImage="goto-today.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="dayoverview"
+	const:buttonLabel="Day View"
+	rsrc:buttonImage="day-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="weekoverview"
+	const:buttonLabel="Week View"
+	rsrc:buttonImage="week-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="monthoverview"
+	const:buttonLabel="Month View"
+	rsrc:buttonImage="month-view.png" />
+
+</div>
+
   <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
     <tr>
       <td class="wintitle">
@@ -52,10 +100,11 @@
         <table border="0" width="100%" cellpadding="0" cellspacing="0">
           <tr>
             <td colspan="2">
-              <var:component className="UIxCalSelectTab"
-                             const:selection="day"
-                             currentDate="selectedDate"
-              >
+    <var:component className="UIxCalSelectTab"
+      const:selection="day"
+      currentDate="selectedDate"
+      >
+
                 <table border="0" cellpadding="4" width="100%" cellspacing="2">
                   <tr>
                     <td width="1%" align="left" valign="middle" bgcolor="#e8e8e0">
diff --git a/UI/Templates/UIxCalDayPrintview.wox b/UI/Templates/UIxCalDayPrintview.wox
index 371e2e10b..47554e559 100644
--- a/UI/Templates/UIxCalDayPrintview.wox
+++ b/UI/Templates/UIxCalDayPrintview.wox
@@ -7,6 +7,54 @@
                className="UIxPrintPageFrame"
                title="title"
 >
+
+<div class="toolbar">
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new"
+	const:buttonLabel="New Event"
+	rsrc:buttonImage="new-event.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new_task"
+	const:buttonLabel="New Task"
+	rsrc:buttonImage="new-task.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="edit"
+	const:buttonLabel="Edit"
+	rsrc:buttonImage="edit.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="delete"
+	const:buttonLabel="Delete"
+	rsrc:buttonImage="delete.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="today"
+	const:buttonLabel="Go to Today"
+	rsrc:buttonImage="goto-today.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="dayoverview"
+	const:buttonLabel="Day View"
+	rsrc:buttonImage="day-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="weekoverview"
+	const:buttonLabel="Week View"
+	rsrc:buttonImage="week-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="monthoverview"
+	const:buttonLabel="Month View"
+	rsrc:buttonImage="month-view.png" />
+
+</div>
+
   <table border="1" cellpadding="5" cellspacing="0" width="100%">
     <tr>
       <td colspan="2" align="center">
diff --git a/UI/Templates/UIxCalMonthOverview.wox b/UI/Templates/UIxCalMonthOverview.wox
index d591e09d5..803cab92b 100644
--- a/UI/Templates/UIxCalMonthOverview.wox
+++ b/UI/Templates/UIxCalMonthOverview.wox
@@ -7,6 +7,54 @@
                className="UIxPageFrame"
                title="name"
 >
+
+<div class="toolbar">
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new"
+	const:buttonLabel="New Event"
+	rsrc:buttonImage="new-event.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new_task"
+	const:buttonLabel="New Task"
+	rsrc:buttonImage="new-task.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="edit"
+	const:buttonLabel="Edit"
+	rsrc:buttonImage="edit.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="delete"
+	const:buttonLabel="Delete"
+	rsrc:buttonImage="delete.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="today"
+	const:buttonLabel="Go to Today"
+	rsrc:buttonImage="goto-today.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="dayoverview"
+	const:buttonLabel="Day View"
+	rsrc:buttonImage="day-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="weekoverview"
+	const:buttonLabel="Week View"
+	rsrc:buttonImage="week-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="monthoverview"
+	const:buttonLabel="Month View"
+	rsrc:buttonImage="month-view.png" />
+
+</div>
+
   <table id="skywintable"
          class="wintable"
          cellspacing="0"
diff --git a/UI/Templates/UIxCalWeekChartview.wox b/UI/Templates/UIxCalWeekChartview.wox
index 2a58230b5..208b9f132 100644
--- a/UI/Templates/UIxCalWeekChartview.wox
+++ b/UI/Templates/UIxCalWeekChartview.wox
@@ -8,6 +8,53 @@
                className="UIxPageFrame"
                title="name">
 
+<div class="toolbar">
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new"
+	const:buttonLabel="New Event"
+	rsrc:buttonImage="new-event.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new_task"
+	const:buttonLabel="New Task"
+	rsrc:buttonImage="new-task.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="edit"
+	const:buttonLabel="Edit"
+	rsrc:buttonImage="edit.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="delete"
+	const:buttonLabel="Delete"
+	rsrc:buttonImage="delete.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="today"
+	const:buttonLabel="Go to Today"
+	rsrc:buttonImage="goto-today.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="dayoverview"
+	const:buttonLabel="Day View"
+	rsrc:buttonImage="day-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="weekoverview"
+	const:buttonLabel="Week View"
+	rsrc:buttonImage="week-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="monthoverview"
+	const:buttonLabel="Month View"
+	rsrc:buttonImage="month-view.png" />
+
+</div>
+
   <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
     <tr>
       <td class="wintitle">
diff --git a/UI/Templates/UIxCalWeekColumnsview.wox b/UI/Templates/UIxCalWeekColumnsview.wox
index 1a97f86f1..2e6479257 100644
--- a/UI/Templates/UIxCalWeekColumnsview.wox
+++ b/UI/Templates/UIxCalWeekColumnsview.wox
@@ -8,6 +8,53 @@
                className="UIxPageFrame"
                title="name">
 
+<div class="toolbar">
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new"
+	const:buttonLabel="New Event"
+	rsrc:buttonImage="new-event.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new_task"
+	const:buttonLabel="New Task"
+	rsrc:buttonImage="new-task.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="edit"
+	const:buttonLabel="Edit"
+	rsrc:buttonImage="edit.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="delete"
+	const:buttonLabel="Delete"
+	rsrc:buttonImage="delete.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="today"
+	const:buttonLabel="Go to Today"
+	rsrc:buttonImage="goto-today.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="dayoverview"
+	const:buttonLabel="Day View"
+	rsrc:buttonImage="day-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="weekoverview"
+	const:buttonLabel="Week View"
+	rsrc:buttonImage="week-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="monthoverview"
+	const:buttonLabel="Month View"
+	rsrc:buttonImage="month-view.png" />
+
+</div>
+
   <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" width="100%">
     <tr>
       <td class="wintitle">
diff --git a/UI/Templates/UIxCalWeekListview.wox b/UI/Templates/UIxCalWeekListview.wox
index ec9aea4a2..41ead99f0 100644
--- a/UI/Templates/UIxCalWeekListview.wox
+++ b/UI/Templates/UIxCalWeekListview.wox
@@ -8,6 +8,54 @@
                className="UIxPageFrame"
                title="name"
 >
+
+<div class="toolbar">
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new"
+	const:buttonLabel="New Event"
+	rsrc:buttonImage="new-event.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new_task"
+	const:buttonLabel="New Task"
+	rsrc:buttonImage="new-task.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="edit"
+	const:buttonLabel="Edit"
+	rsrc:buttonImage="edit.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="delete"
+	const:buttonLabel="Delete"
+	rsrc:buttonImage="delete.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="today"
+	const:buttonLabel="Go to Today"
+	rsrc:buttonImage="goto-today.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="dayoverview"
+	const:buttonLabel="Day View"
+	rsrc:buttonImage="day-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="weekoverview"
+	const:buttonLabel="Week View"
+	rsrc:buttonImage="week-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="monthoverview"
+	const:buttonLabel="Month View"
+	rsrc:buttonImage="month-view.png" />
+
+</div>
+
   <table id="skywintable"
          class="wintable"
          cellspacing="0"
diff --git a/UI/Templates/UIxCalWeekOverview.wox b/UI/Templates/UIxCalWeekOverview.wox
index 7a60f10d3..2437ef2cf 100644
--- a/UI/Templates/UIxCalWeekOverview.wox
+++ b/UI/Templates/UIxCalWeekOverview.wox
@@ -8,6 +8,54 @@
                className="UIxPageFrame"
                title="name"
 >
+
+<div class="toolbar">
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new"
+	const:buttonLabel="New Event"
+	rsrc:buttonImage="new-event.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new_task"
+	const:buttonLabel="New Task"
+	rsrc:buttonImage="new-task.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="edit"
+	const:buttonLabel="Edit"
+	rsrc:buttonImage="edit.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="delete"
+	const:buttonLabel="Delete"
+	rsrc:buttonImage="delete.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="today"
+	const:buttonLabel="Go to Today"
+	rsrc:buttonImage="goto-today.png" />
+
+<var:component className="UIxToolbarSeparator" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="dayoverview"
+	const:buttonLabel="Day View"
+	rsrc:buttonImage="day-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="weekoverview"
+	const:buttonLabel="Week View"
+	rsrc:buttonImage="week-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="monthoverview"
+	const:buttonLabel="Month View"
+	rsrc:buttonImage="month-view.png" />
+
+</div>
+
   <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" 
          width="100%">
   <tr>
diff --git a/UI/Templates/UIxCalYearOverview.wox b/UI/Templates/UIxCalYearOverview.wox
index 117047b9e..58df4d564 100644
--- a/UI/Templates/UIxCalYearOverview.wox
+++ b/UI/Templates/UIxCalYearOverview.wox
@@ -7,6 +7,50 @@
                className="UIxPageFrame"
                title="name"
 >
+
+<div class="toolbar">
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new"
+	const:buttonLabel="New Event"
+	rsrc:buttonImage="new-event.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="new_task"
+	const:buttonLabel="New Task"
+	rsrc:buttonImage="new-task.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="edit"
+	const:buttonLabel="Edit"
+	rsrc:buttonImage="edit.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="delete"
+	const:buttonLabel="Delete"
+	rsrc:buttonImage="delete.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="today"
+	const:buttonLabel="Go to Today"
+	rsrc:buttonImage="goto-today.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="dayoverview"
+	const:buttonLabel="Day View"
+	rsrc:buttonImage="day-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="weekoverview"
+	const:buttonLabel="Week View"
+	rsrc:buttonImage="week-view.png" />
+
+<var:component className="UIxToolbarButton"
+	const:buttonLink="monthoverview"
+	const:buttonLabel="Month View"
+	rsrc:buttonImage="month-view.png" />
+
+</div>
+
   <table id="skywintable" class="wintable" cellspacing="0" cellpadding="5" 
          width="100%">
     <tr>
diff --git a/UI/Templates/UIxToolbarButton.wox b/UI/Templates/UIxToolbarButton.wox
new file mode 100644
index 000000000..e1632696e
--- /dev/null
+++ b/UI/Templates/UIxToolbarButton.wox
@@ -0,0 +1,18 @@
+<?xml version='1.0' standalone='yes'?>
+<a xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:rsrc="OGo:url"
+    class="toolbarButton"
+    var:href="buttonLink">
+<span class="toolbarButton">
+<img class="buttonImage"
+	var:src="buttonImage"
+	var:alt="buttonTooltip"
+	var:title="buttonTooltip" /><br />
+<span class="buttonLabel"
+	    var:alt="buttonTooltip"
+	    var:title="buttonTooltip"><var:string
+	      value="buttonLabel" /></span>
+</span>
+</a>
diff --git a/UI/Templates/UIxToolbarSeparator.wox b/UI/Templates/UIxToolbarSeparator.wox
new file mode 100644
index 000000000..4bb3c9e03
--- /dev/null
+++ b/UI/Templates/UIxToolbarSeparator.wox
@@ -0,0 +1,8 @@
+<?xml version='1.0' standalone='yes'?>
+<span class="toolbarSeparator"
+    xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:var="http://www.skyrix.com/od/binding"
+    xmlns:const="http://www.skyrix.com/od/constant"
+    xmlns:rsrc="OGo:url">
+<var:entity value="nbsp" />
+</span>