diff --git a/ui/ChangeLog b/ui/ChangeLog
index c67c4acf3b..91cb7d3e92 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,9 @@
+2001-08-18  Damon Chaplin  <damon@ximian.com>
+
+	* evolution-calendar.xml: changed goto icon from stock icon to pixbuf
+	for the toolbar. Note that the menu still uses the stock icon. Yuck!
+	Added 'New Task' command to toolbar and menus.
+
 2001-08-17  Damon Chaplin  <damon@ximian.com>
 
 	* evolution-addressbook.xml: changed print icon types to pixbuf.
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index 8c5cd3998d..0527d71c3f 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -12,7 +12,7 @@
     <cmd name="CalendarPrev" _tip="Go back" pixtype="pixbuf"/>
     <cmd name="CalendarToday" _tip="Go to today" pixtype="stock" pixname="Home"/>
     <cmd name="CalendarNext" _tip="Go forward" pixtype="pixbuf"/>
-    <cmd name="CalendarGoto" _tip="Go to a specific date" pixtype="stock" pixname="Jump To"/>
+    <cmd name="CalendarGoto" _tip="Go to a specific date"/>
 
     <cmd name="ShowDayView" _tip="Show one day" pixtype="pixbuf"/>
     <cmd name="ShowWorkWeekView" _tip="Show work week" pixtype="pixbuf"/>
@@ -37,6 +37,8 @@
 	<placeholder name="NewFirstItem">
 	  <menuitem name="NewAppointment" verb="CalendarNewAppointment"
 		    _label="_Appointment..." pixtype="pixbuf"/>
+	  <menuitem name="NewTask" verb="CalendarNewTask"
+		    _label="_Task..." pixtype="pixbuf"/>
 	  <separator/>
 	</placeholder>
 
@@ -61,7 +63,7 @@
     <submenu name="View">
       <placeholder name="ViewBegin">
 	<menuitem name="Today" verb="CalendarToday" _label="Go to _Today"/>
-	<menuitem name="Goto" verb="CalendarGoto" _label="Go to _Date"/>
+	<menuitem name="Goto" verb="CalendarGoto" _label="Go to _Date" pixtype="stock" pixname="Jump To"/>
 	<separator/>
       </placeholder>
 
@@ -77,11 +79,13 @@
       <submenu name="Actions" _label="_Actions">
 	<menuitem name="NewAppointment" verb="CalendarNewAppointment"
 		  _label="Create a _New Appointment" pixtype="pixbuf"/>
-	<menuitem name="NewEvent" verb="CalendarNewEvent" _label="Create a New All-Day _Event"/>
+	<menuitem name="NewEvent" verb="CalendarNewEvent" _label="Create a New All-Day _Event" pixtype="pixbuf"/>
+
+	<menuitem name="NewTask" verb="CalendarNewTask" _label="Create a New _Task" pixtype="pixbuf"/>
 
 	<separator/>
 
-	<menuitem name="PublishFreeBusy" verb="" _label="Publish Free/Busy Information"/>
+	<menuitem name="PublishFreeBusy" verb="" _label="_Publish Free/Busy Information"/>
       </submenu>
     </placeholder>
   </menu>
@@ -91,6 +95,9 @@
     <toolitem name="New" verb="CalendarNewAppointment" _label="New Appointment"
 	      priority="1" pixtype="pixbuf"/>
 
+    <toolitem name="NewTask" verb="CalendarNewTask" _label="New Task"
+	      priority="1" pixtype="pixbuf"/>
+
     <separator/>
 
     <toolitem name="Print" verb="CalendarPrint" pixtype = "pixbuf"/>
@@ -103,7 +110,7 @@
 
     <separator/>
 
-    <toolitem name="Goto" verb="CalendarGoto" _label="Go To" priority="1"/>
+    <toolitem name="Goto" verb="CalendarGoto" _label="Go To" priority="1" pixtype="pixbuf"/>
 
     <separator/>