** Fixes bug #477045

2007-09-27  Matthew Barnes  <mbarnes@redhat.com>

	** Fixes bug #477045

	* addressbook/gui/component/addressbook-component.c:
	* addressbook/gui/component/addressbook-view.c:
	* addressbook/gui/contact-editor/e-contact-editor-address.c:
	* addressbook/gui/contact-editor/e-contact-editor-fullname.c:
	* addressbook/gui/contact-editor/e-contact-editor-im.c:
	* addressbook/gui/widgets/e-addressbook-view.c:
	* addressbook/gui/widgets/eab-contact-display.c:
	* calendar/gui/calendar-commands.c:
	* calendar/gui/calendar-component.c:
	* calendar/gui/dialogs/cal-attachment-select-file.c:
	* calendar/gui/dialogs/comp-editor.c:
	* calendar/gui/dialogs/event-editor.c:
	* calendar/gui/dialogs/task-editor.c:
	* calendar/gui/e-cal-popup.c:
	* calendar/gui/e-calendar-table.c:
	* calendar/gui/e-calendar-view.c:
	* calendar/gui/e-day-view.c:
	* calendar/gui/e-memo-table.c:
	* calendar/gui/e-week-view.c:
	* calendar/gui/memos-component.c:
	* calendar/gui/memos-control.c:
	* calendar/gui/tasks-component.c:
	* calendar/gui/tasks-control.c:
	* composer/e-msg-composer-select-file.c:
	* composer/e-msg-composer.c:
	* mail/em-folder-tree.c:
	* mail/em-folder-view.c:
	* mail/em-popup.c:
	* mail/mail-component.c:
	* mail/mail-mt.c:
	* mail/mail-send-recv.c:
	* mail/message-list.c:
	* plugins/exchange-folder-permission.c:
	* plugins/exchange-folder.c:
	* plugins/groupwise-features/share-folder-common.c:
	* shell/e-shell-window-commands.c:
	* ui/evolution-addressbook.xml:
	* ui/evolution-calendar.xml:
	* ui/evolution-composer-entries.xml:
	* ui/evolution-editor.xml:
	* ui/evolution-event-editor.xml:
	* ui/evolution-mail-list.xml:
	* ui/evolution-mail-message.xml:
	* ui/evolution-memos.xml:
	* ui/evolution-message-composer.xml:
	* ui/evolution-subscribe.xml:
	* ui/evolution-task-editor.xml:
	* ui/evolution-tasks.xml:
	* ui/evolution.xml:
	Use standard icon names where applicable.


svn path=/trunk/; revision=34322

14 files changed, 149 insertions, 131 deletions

diff --git a/ui/ChangeLog b/ui/ChangeLog
index e001abd2cf..0c35eca261 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,22 @@
+2007-09-27  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes part of bug #477045
+
+	* evolution-composer-entries.xml:
+	* evolution-addressbook.xml:
+	* evolution.xml:
+	* evolution-mail-message.xml:
+	* evolution-event-editor.xml:
+	* evolution-message-composer.xml:
+	* evolution-calendar.xml:
+	* evolution-memos.xml:
+	* evolution-subscribe.xml:
+	* evolution-tasks.xml:
+	* evolution-editor.xml:
+	* evolution-task-editor.xml:
+	* evolution-mail-list.xml:
+	Use standard icon names where applicable.
+
 2007-07-06  Matthew Barnes  <mbarnes@redhat.com>
 
 	** Fixes part of bug #446894
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index 5c31d09276..6f837b8c4f 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -1,18 +1,17 @@
 <Root>
   <commands>
+
     <cmd name="ContactDelete"
 	 _tip="Delete selected contacts"
-	 pixtype="stock" pixname="gtk-delete"
-	 accel="*Control*d"/>
+	 accel="*Control*d" pixtype="pixbuf"/>
 
     <cmd name="ContactsPrint"
 	 _tip="Print selected contacts"
-	 pixtype="stock" pixname="gtk-print"
-	 accel="*Control*p"/>
+	 accel="*Control*p" pixtype="pixbuf"/>
 
     <cmd name="ContactsPrintPreview"
 	 _tip="Previews the contacts to be printed"
-	 pixtype="stock" pixname="gtk-print-preview"/>
+         pixtype="pixbuf"/>
 
     <cmd name="ContactsView"
 	 _tip="View the current contact"
@@ -22,19 +21,17 @@
 	 _tip="Stop Loading"
 	 pixtype="stock" pixname="gtk-stop"/>
 
-    <cmd name="ContactsCut" _label="Cut" _tip="Cut the selection"
-	 pixtype="stock" pixname="gtk-cut"
-	 accel="*Control*x"/>
+    <cmd name="ContactsCut" _label="Cut"
+	 _tip="Cut the selection"
+	 accel="*Control*x" pixtype="pixbuf"/>
 
     <cmd name="ContactsCopy" _label="Copy"
 	 _tip="Copy the selection"
-	 pixtype="stock" pixname="gtk-copy"
-	 accel="*Control*c"/>
+	 accel="*Control*c" pixtype="pixbuf"/>
 
     <cmd name="ContactsPaste" _label="Paste"
 	 _tip="Paste the clipboard"
-	 pixtype="stock" pixname="gtk-paste"
-	 accel="*Control*v"/>
+	 accel="*Control*v" pixtype="pixbuf"/>
 
     <cmd name="ContactsSelectAll" _label="Select All"
 	 _tip="Select all contacts"
@@ -42,14 +39,15 @@
 
     <cmd name="ContactsSaveAsVCard" _label="Save as VCard..."
 	 _tip="Save selected contacts as a VCard."
-	 pixtype="stock" pixname="gtk-save-as"
-	 accel="*Control*s"/>
+	 accel="*Control*s" pixtype="pixbuf"/>
 
     <cmd name="ContactsSendContactToOther" _label="Forward Contact"
-	 _tip="Send selected contacts to another person."/>
+	 _tip="Send selected contacts to another person."
+	 pixtype="pixbuf"/>
 
     <cmd name="ContactsSendMessageToContact" _label="Send message to contact"
-	 _tip="Send a message to the selected contacts."/>
+	 _tip="Send a message to the selected contacts."
+	 pixtype="pixbuf"/>
 
     <cmd name="ContactsCopyToFolder" _label="Copy to Folder..."
 	 _tip="Copy Selected Contacts to Another Folder..."
@@ -75,19 +73,24 @@
     <cmd name="FolderMove" _label="_Move Folder Contacts To"
 	 _tip="Move the contacts of the selected folder into another folder" 
 	 pixtype="pixbuf"/>  
+
     <cmd name="FolderSave" _label="_Save Folder Contacts As VCard"
 	 _tip="Save the contacts of the selected folder as VCard"
 	 pixtype="pixbuf"/>   
+
     <cmd name="FolderDelete" _label="_Delete"
 	 _tip="Delete the selected folder"
-	 pixtype="pixbuf"/>   
+	 pixtype="pixbuf"/>
+
     <cmd name="FolderRename" _label="_Rename"
 	 _tip="Rename the selected folder"
 	 pixtype="pixbuf"
 	 accel="F2"/>   
+
     <cmd name="ChangeFolderProperties" _label="_Properties"
 	 _tip="Change the properties of the selected folder"
 	 pixtype="pixbuf"/>   
+
   </commands>
 
   <menu>
@@ -98,14 +101,12 @@
 	<menuitem name="ContactsSaveAsVCard"
 		  verb="" _label="_Save Contact as VCard..."/>
 	<menuitem name="FolderSave" 
-		  verb="" _label="S_ave Address Book As VCard" pixtype="pixbuf"/>
+		  verb="" _label="S_ave Address Book As VCard"/>
       </placeholder>
 
       <placeholder name="Print">
-	<menuitem name="ContactsPrintPreview" verb=""
-		  _label="Print Pre_view"/>
-	<menuitem name="ContactsPrint" verb=""
-		  _label="_Print..."/>
+	<menuitem name="ContactsPrintPreview" verb="" _label="Print Pre_view"/>
+	<menuitem name="ContactsPrint" verb="" _label="_Print..."/>
       </placeholder>
 
     </submenu>
@@ -130,7 +131,7 @@
 
 	<menuitem name="ContactDelete" verb="" _label="_Delete Contact"/>
 	
-	<menuitem name="FolderDelete" verb="" _label="Del_ete Address Book" pixtype="stock" pixname="gtk-delete"/>
+	<menuitem name="FolderDelete" verb="" _label="Del_ete Address Book"/>
       </placeholder>
     </submenu>
 
@@ -140,10 +141,10 @@
     <placeholder name="ActionsPlaceholder">
       <submenu name="Actions" _label="_Actions">
 	<menuitem name="ContactsSendContactToOther"
-		  _label="_Forward Contact..." verb="" pixtype="pixbuf"/>
+		  _label="_Forward Contact..." verb=""/>
 
 	<menuitem name="ContactsSendMessageToContact"
-		  _label="_Send Message to Contact..." verb="" pixtype="pixbuf"/>
+		  _label="_Send Message to Contact..." verb=""/>
 	<menuitem name="ContactActionStop" verb="ContactStop" _label="St_op"/>
 
 	<separator f="" name="eadbk5"/>
@@ -153,13 +154,13 @@
 	
 	<separator f="" name="eadbk4"/>
 
-	<menuitem name="FolderCopy" verb="" _label="Co_py All Contacts To..." pixtype="pixbuf"/>
+	<menuitem name="FolderCopy" verb="" _label="Co_py All Contacts To..."/>
 
-	<menuitem name="FolderMove" verb="" _label="Mo_ve All Contacts To..." pixtype="pixbuf"/>
+	<menuitem name="FolderMove" verb="" _label="Mo_ve All Contacts To..."/>
 
 	<separator f="" name="eadbk3"/>
 
-	<menuitem name="ChangeFolderProperties" verb="" _label="Address _Book Properties" pixtype="pixbuf"/>
+	<menuitem name="ChangeFolderProperties" verb="" _label="Address _Book Properties"/>
 
       </submenu>
     </placeholder>
@@ -168,10 +169,10 @@
 
   <dockitem name="Toolbar">
     <toolitem name="ContactsPrint" verb=""
-	      _label="Print"/>
+	      _label="Print" pixtype="pixbuf"/>
 
     <toolitem name="ContactDelete" verb=""
-	      _label="Delete"/>
+	      _label="Delete" pixtype="pixbuf"/>
 
     <toolitem name="ContactStop" verb=""
 	      _label="Stop"/>
diff --git a/ui/evolution-calendar.xml b/ui/evolution-calendar.xml
index 3a7c94feb8..662a9206c4 100644
--- a/ui/evolution-calendar.xml
+++ b/ui/evolution-calendar.xml
@@ -1,14 +1,14 @@
 <Root>
   <commands>
     <cmd name="EventOpen" _tip="View the current appointment" accel="*Control*o"/>
-    <cmd name="CalendarPrint" _tip="Print this calendar" pixtype="stock" pixname="gtk-print"
+    <cmd name="CalendarPrint" _tip="Print this calendar" pixtype="pixbuf"
 	 accel="*Control*p"/>
-    <cmd name="CalendarPrintPreview" _tip="Previews the calendar to be printed" pixtype="stock" pixname="gtk-print-preview"/>
+    <cmd name="CalendarPrintPreview" _tip="Previews the calendar to be printed" pixtype="pixbuf"/>
 
     <cmd name="CalendarPrev" _tip="Go back" pixtype="pixbuf"/>
     <cmd name="CalendarToday" _tip="Select today" pixtype="stock" pixname="Home"/>
     <cmd name="CalendarNext" _tip="Go forward" pixtype="pixbuf"/>
-    <cmd name="CalendarGoto" _tip="Select a specific date" pixtype="stock" pixname="gtk-jump-to"/>
+    <cmd name="CalendarGoto" _tip="Select a specific date" pixtype="pixbuf"/>
 
     <cmd name="ShowDayView" _tip="Show one day" pixtype="pixbuf"/>
     <cmd name="ShowWorkWeekView" _tip="Show the working week" pixtype="pixbuf"/>
@@ -16,13 +16,13 @@
     <cmd name="ShowMonthView" _tip="Show one month" pixtype="pixbuf"/>
     <cmd name="ShowListView" _tip="Show as list" pixtype="pixbuf"/>
 
-    <cmd name="Cut" _tip="Cut the selection" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
-    <cmd name="Copy" _tip="Copy the selection" accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
-    <cmd name="Paste" _tip="Paste the clipboard" accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
+    <cmd name="Cut" _tip="Cut the selection" accel="*Control*x" pixtype="pixbuf"/>
+    <cmd name="Copy" _tip="Copy the selection" accel="*Control*c" pixtype="pixbuf"/>
+    <cmd name="Paste" _tip="Paste the clipboard" accel="*Control*v" pixtype="pixbuf"/>
 
-    <cmd name="Delete" _tip="Delete the appointment" accel="*Control*d" pixtype="stock" pixname="gtk-delete"/>
-    <cmd name="DeleteOccurrence" _tip="Delete this occurrence" pixtype="stock" pixname="gtk-delete"/>
-    <cmd name="DeleteAllOccurrences" _tip="Delete all occurrences" pixtype="stock" pixname="gtk-delete"/>
+    <cmd name="Delete" _tip="Delete the appointment" accel="*Control*d" pixtype="pixbuf"/>
+    <cmd name="DeleteOccurrence" _tip="Delete this occurrence" pixtype="pixbuf"/>
+    <cmd name="DeleteAllOccurrences" _tip="Delete all occurrences" pixtype="pixbuf"/>
     
     <cmd name="CalendarPurge" _label="Purg_e" _tip="Purge old appointments and meetings" accel="*Control*e"/>
   </commands>
@@ -75,8 +75,8 @@
 
   <dockitem name="Toolbar">
   
-    <toolitem name="Print" verb="CalendarPrint" _label="Print"/>
-    <toolitem name="Delete" verb="" _label="Delete"/>
+    <toolitem name="Print" verb="CalendarPrint" _label="Print" pixtype="pixbuf"/>
+    <toolitem name="Delete" verb="" _label="Delete" pixtype="pixbuf"/>
 
     <separator f="" name="ecal2"/>
 
@@ -86,7 +86,7 @@
 
     <separator f="" name="ecal3"/>
 
-    <toolitem name="Goto" verb="CalendarGoto" _label="Go To" priority="1"/>
+    <toolitem name="Goto" verb="CalendarGoto" _label="Go To" priority="1" pixtype="pixbuf"/>
 
     <separator f="" name="ecal4"/>
 
diff --git a/ui/evolution-composer-entries.xml b/ui/evolution-composer-entries.xml
index f38dfa3589..f8cc923bf7 100644
--- a/ui/evolution-composer-entries.xml
+++ b/ui/evolution-composer-entries.xml
@@ -3,15 +3,15 @@
 
     <cmd name="EditCut"
      _tip="Cut selected text to the clipboard"
-     accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
+     accel="*Control*x" pixtype="pixbuf"/>
 
     <cmd name="EditCopy"
      _tip="Copy selected text to the clipboard"
-     accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
+     accel="*Control*c" pixtype="pixbuf"/>
 
     <cmd name="EditPaste"
      _tip="Paste text from the clipboard"
-     accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
+     accel="*Control*v" pixtype="pixbuf"/>
 
     <cmd name="EditSelectAll"
      _tip="Select all text"
@@ -37,4 +37,4 @@
 	<toolitem name="EditPaste" verb=""  _label="Paste" _tip="Paste from clipboard"/>
   </dockitem>
 
-</Root>
\ No newline at end of file
+</Root>
diff --git a/ui/evolution-editor.xml b/ui/evolution-editor.xml
index 4f819b78f9..d16b8b5d29 100644
--- a/ui/evolution-editor.xml
+++ b/ui/evolution-editor.xml
@@ -1,15 +1,15 @@
 <Root>
   <commands>
-	  <cmd name="FileSave" _tip="Click here to save the current window" accel="*Control*s" pixtype="stock" pixname="gtk-save"/>
-	  <cmd name="FileClose" _tip="Click here to close the current window" accel="*Control*w" pixtype="stock" pixname="gtk-close"/>
+	  <cmd name="FileSave" _tip="Click here to save the current window" accel="*Control*s" pixtype="pixbuf"/>
+	  <cmd name="FileClose" _tip="Click here to close the current window" accel="*Control*w" pixtype="pixbuf"/>
 	  
-    	  <cmd name="EditCut" _tip="Cut selected text to the clipboard" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
-	  <cmd name="EditCopy" _tip="Copy selected text to the clipboard" accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
-	  <cmd name="EditPaste" _tip="Paste text from the clipboard" accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
+    	  <cmd name="EditCut" _tip="Cut selected text to the clipboard" accel="*Control*x" pixtype="pixbuf"/>
+	  <cmd name="EditCopy" _tip="Copy selected text to the clipboard" accel="*Control*c" pixtype="pixbuf"/>
+	  <cmd name="EditPaste" _tip="Paste text from the clipboard" accel="*Control*v" pixtype="pixbuf"/>
 	  <cmd name="EditSelectAll" _tip="Select all text" accel="*Control*a"/>
 
 	  <cmd name="InsertAttachments" _tip="Click here to attach a file" accel="*Control*m" pixtype="pixbuf"/>
-	  <cmd name="Help" _tip="Click here to view help available" accel="F1" pixtype="stock" pixname="gtk-help"/>
+	  <cmd name="Help" _tip="Click here to view help available" accel="F1" pixtype="pixbuf"/>
 	  
 	  
   </commands>
@@ -39,7 +39,7 @@
 
     <submenu name="Insert" _label="I_nsert">
       <placeholder name="Attachments">
-	      <menuitem name="InsertAttachments" verb="" _label="_Attachment..." pixtype="pixbuf"/>
+	      <menuitem name="InsertAttachments" verb="" _label="_Attachment..."/>
       </placeholder>
      </submenu>
 
@@ -53,8 +53,8 @@
 
   <dockitem name="Toolbar">
   
-    <toolitem name="FileSave" verb="" _label="Save"/>
-    <toolitem name="FileClose" verb="" _label="Close"/>
+    <toolitem name="FileSave" verb="" _label="Save" pixtype="pixbuf"/>
+    <toolitem name="FileClose" verb="" _label="Close" pixtype="pixbuf"/>
     <separator f="" name="editor1"/>
 
     <toolitem name="InsertAttachments" verb="" _label="Attach" pixtype="pixbuf"/>
diff --git a/ui/evolution-event-editor.xml b/ui/evolution-event-editor.xml
index f50fe084c8..fa43cb56b2 100644
--- a/ui/evolution-event-editor.xml
+++ b/ui/evolution-event-editor.xml
@@ -45,13 +45,15 @@
 		_tip="Make this a recurring event" pixtype="pixbuf"/>
 
 		<cmd name="ActionFreeBusy" _label="_Free/Busy"
-		_tip="Query free / busy information for the attendees" pixtype="pixbuf"/>
+		_tip="Query free / busy information for the attendees"
+		pixtype="pixbuf"/>
 
 		<cmd name="InsertSendOptions" _label="Send Options"
 		_tip="Insert advanced send options"/>
 
 		<cmd name="ActionAlarm" _label="_Alarms"
-		_tip="Click here to set or unset alarms for this event" />
+		_tip="Click here to set or unset alarms for this event"
+		pixtype="pixbuf"/>
 	</commands>
 	
 
@@ -71,7 +73,7 @@
 	    <menuitem name="InsertSendOptions" verb="" _label="Send _Options"/>	    
     </submenu>
     <submenu name="Options">
-	    <menuitem name="ActionAlarm" verb="" _label="_Alarms" pixtype="pixbuf"/>
+	    <menuitem name="ActionAlarm" verb="" _label="_Alarms"/>
 	    <menuitem name="ActionShowTimeBusy" verb="" _label="Show time as _busy"/>
 	    <menuitem name="ActionAllDayEvent" verb="" _label="All _Day Event"/>
 	    <submenu name="Classification" _label="_Classification">
@@ -79,8 +81,8 @@
 		    <menuitem name="ActionClassPrivate" id="ActionClassPrivate" verb=""/>
 		    <menuitem name="ActionClassConfidential" id="ActionClassConfidential" verb=""/>
 	    </submenu>
-	    <menuitem name="ActionRecurrence" verb="" _label="_Recurrence" pixtype="pixbuf"/>
-	    <menuitem name="ActionFreeBusy" verb="" _label="_Free/Busy" pixtype="pixbuf"/>	    
+	    <menuitem name="ActionRecurrence" verb="" _label="_Recurrence"/>
+	    <menuitem name="ActionFreeBusy" verb="" _label="_Free/Busy"/>	    
     </submenu>
   </menu>
 
diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml
index 11cfe7c439..c39ee83b31 100644
--- a/ui/evolution-mail-list.xml
+++ b/ui/evolution-mail-list.xml
@@ -4,15 +4,15 @@
 
     <cmd name="EditCut"
      _tip="Cut selected message(s) to the clipboard"
-     accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
+     accel="*Control*x" pixtype="pixbuf"/>
 
     <cmd name="EditCopy"
      _tip="Copy selected message(s) to the clipboard"
-     accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
+     accel="*Control*c" pixtype="pixbuf"/>
 
     <cmd name="EditPaste"
      _tip="Paste message(s) from the clipboard"
-     accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
+     accel="*Control*v" pixtype="pixbuf"/>
 
     <cmd name="EditInvertSelection"
      _tip="Select all and only the messages that are not currently selected"
@@ -119,8 +119,8 @@
 
  	<placeholder name="FolderOps">
 	  <menuitem name="FolderRename" verb="" _label="_Rename..."/>
-          <menuitem name="FolderRefresh" verb="" _label="Re_fresh..." pixtype="stock" pixname="stock_refresh"/>
-	  <menuitem name="FolderDelete" verb="" _label="_Delete" pixtype="stock" pixname="gtk-delete"/>
+          <menuitem name="FolderRefresh" verb="" _label="Re_fresh..." pixtype="pixbuf"/>
+	  <menuitem name="FolderDelete" verb="" _label="_Delete" pixtype="pixbuf"/>
 
  	  <separator f="" name="FolderOps1"/>
           <menuitem name="ChangeFolderProperties" verb="" _label="_Properties"/>
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index 1663b795b1..f6fade2f39 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -11,15 +11,15 @@
 
     <cmd name="EditCut"
      _tip="Cut selected messages to the clipboard"
-     accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
+     accel="*Control*x" pixtype="pixbuf"/>
 
     <cmd name="EditCopy"
      _tip="Copy selected messages to the clipboard"
-     accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
+     accel="*Control*c" pixtype="pixbuf"/>
 
     <cmd name="EditPaste"
      _tip="Paste messages from the clipboard"
-     accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
+     accel="*Control*v" pixtype="pixbuf"/>
 
     <cmd name="MailNext"
      _tip="Display the next message"
@@ -126,8 +126,7 @@
 
     <cmd name="MessageOpen"
      _tip="Open the selected messages in a new window"
-     accel="*Control*o"
-     pixtype="pixbuf"/>
+     accel="*Control*o"/>
 
     <cmd name="MailPost"
      _tip="Post a message to a Public folder"/>
@@ -157,12 +156,12 @@
     <cmd name="MessageSaveAs"
      _tip="Save the selected messages as a text file"
      accel="*Control*s"
-     pixtype="stock" pixname="gtk-save-as"/>
+     pixtype="pixbuf"/>
 
     <cmd name="MessageSearch"
      _tip="Search for text in the body of the displayed message"
      accel="*Control**Shift*f"
-     pixtype="stock" pixname="gtk-find"/>
+     pixtype="pixbuf"/>
 
     <cmd name="MessageUndelete"
      _tip="Undelete the selected messages"
@@ -171,15 +170,14 @@
     <cmd name="PrintMessage"
      _tip="Print this message"
      accel="*Control*p"
-     pixtype="stock" pixname="gtk-print"/>
+     pixtype="pixbuf"/>
 
     <cmd name="PrintPreviewMessage"
      _tip="Preview the message to be printed"
-     pixtype="stock" pixname="gtk-print-preview"/>
+     pixtype="pixbuf"/>
 
     <cmd name="PrintSetup"
-     _tip="Set up the page settings for your current printer"
-     pixtype="pixbuf"/>
+     _tip="Set up the page settings for your current printer"/>
 
     <cmd name="SelectAllText"
      _tip="Select all the text in a message"
@@ -227,15 +225,15 @@
 
     <cmd name="TextZoomIn"
     _tip="Increase the text size"
-    accel="*Control*plus"/>
+    accel="*Control*plus" pixtype="pixbuf"/>
 
     <cmd name="TextZoomOut"
     _tip="Decrease the text size"
-    accel="*Control*minus"/>
+    accel="*Control*minus" pixtype="pixbuf"/>
 
     <cmd name="TextZoomReset"
     _tip="Reset the text to its original size"
-    accel="*Control*0"/>
+    accel="*Control*0" pixtype="pixbuf"/>
 
   </commands>
 
@@ -287,13 +285,9 @@
     <submenu name="View">
        <placeholder name="MailMessageZoom">
           <submenu name="zoom" _label="_Zoom">
- 	  <menuitem name="TextZoomIn" verb="" _label="_Zoom In"
-		    pixtype="stock" pixname="gtk-zoom-in"/>
- 	  <menuitem name="TextZoomOut" verb="" _label="Zoom _Out"
-		    pixtype="stock" pixname="gtk-zoom-out"/>
-
- 	  <menuitem name="TextZoomReset" verb="" _label="_Normal Size"
-		    pixtype="stock" pixname="gtk-zoom-100"/>
+ 	  <menuitem name="TextZoomIn" verb="" _label="_Zoom In"/>
+ 	  <menuitem name="TextZoomOut" verb="" _label="Zoom _Out"/>
+ 	  <menuitem name="TextZoomReset" verb="" _label="_Normal Size"/>
 	  </submenu>
        </placeholder>
 
@@ -318,7 +312,7 @@
         </placeholder>
 
         <placeholder name="MessageNavigation">
-          <submenu name="GoTo" _label="_Go To" pixtype="stock" pixname="gtk-jump-to">
+          <submenu name="GoTo" _label="_Go To" pixtype="pixbuf">
             <menuitem name="MailNext" verb="" _label="_Next Message"/>
             <menuitem name="MailNextUnread" verb="" _label="Next _Unread Message"/>
             <menuitem name="MailNextFlagged" verb="" _label="Next _Important Message"/>
@@ -370,7 +364,7 @@
 
             <menuitem name="MessageFollowUpFlag" verb="" _label="Follow _Up..."/>
             <menuitem name="MessageFollowUpClear" verb="" _label="_Clear Flag"/>
-            <menuitem name="MessageFollowUpComplete" verb="" _label="_Flag Completed" pixtype="pixbuf"/>
+            <menuitem name="MessageFollowUpComplete" verb="" _label="_Flag Completed"/>
 
           </submenu>
           <menuitem name="MessageApplyFilters" verb="" _label="A_pply Filters"/>
@@ -416,7 +410,7 @@
 
       <toolitem name="PrintMessage" verb=""
        _label="Print"
-       pixtype="stock" pixname="gtk-print"/>
+       pixtype="pixbuf"/>
 
       <toolitem name="MessageDelete" verb=""
        _label="Delete"
diff --git a/ui/evolution-memos.xml b/ui/evolution-memos.xml
index 0065a8dad4..9a132d2add 100644
--- a/ui/evolution-memos.xml
+++ b/ui/evolution-memos.xml
@@ -1,15 +1,15 @@
 <Root>
   <commands>
     <cmd name="MemosOpenMemo" _tip="View the selected memo" accel="*Control*o"/>
-    <cmd name="MemosPrint" _tip="Print the list of memos" pixtype="stock" pixname="gtk-print"
+    <cmd name="MemosPrint" _tip="Print the list of memos" pixtype="pixbuf"
 	 accel="*Control*p"/>
-    <cmd name="MemosPrintPreview" _tip="Previews the list of memos to be printed" pixtype="stock" pixname="gtk-print-preview"/>
+    <cmd name="MemosPrintPreview" _tip="Previews the list of memos to be printed" pixtype="pixbuf"/>
 
-    <cmd name="MemosCut" _tip="Cut selected memo" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
-    <cmd name="MemosCopy" _tip="Copy selected memo" accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
-    <cmd name="MemosPaste" _tip="Paste memo from the clipboard" accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
+    <cmd name="MemosCut" _tip="Cut selected memo" accel="*Control*x" pixtype="pixbuf"/>
+    <cmd name="MemosCopy" _tip="Copy selected memo" accel="*Control*c" pixtype="pixbuf"/>
+    <cmd name="MemosPaste" _tip="Paste memo from the clipboard" accel="*Control*v" pixtype="pixbuf"/>
     <cmd name="MemosDelete" _tip="Delete selected memos" accel="*Control*d" sensitive="0"
-         pixtype="stock" pixname="gtk-delete"/>
+         pixtype="pixbuf"/>
 
   </commands>
   
@@ -41,15 +41,15 @@
   </menu>
 
   <dockitem name="Toolbar">
-    <toolitem name="Cut" _label="Cut" verb="MemosCut"/>
-    <toolitem name="Copy" _label="Copy" verb="MemosCopy"/>
-    <toolitem name="Paste" _label="Paste" verb="MemosPaste"/>
+    <toolitem name="Cut" _label="Cut" verb="MemosCut" pixtype="pixbuf"/>
+    <toolitem name="Copy" _label="Copy" verb="MemosCopy" pixtype="pixbuf"/>
+    <toolitem name="Paste" _label="Paste" verb="MemosPaste" pixtype="pixbuf"/>
 
     <separator/>
 
-    <toolitem name="Print" _label="Print" verb="MemosPrint"/>
+    <toolitem name="Print" _label="Print" verb="MemosPrint" pixtype="pixbuf"/>
 
-    <toolitem name="Delete" _label="Delete" verb="MemosDelete"/>
+    <toolitem name="Delete" _label="Delete" verb="MemosDelete" pixtype="pixbuf"/>
 
   </dockitem>
 
diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml
index 33f4c3ecd0..0533a0e486 100644
--- a/ui/evolution-message-composer.xml
+++ b/ui/evolution-message-composer.xml
@@ -2,22 +2,22 @@
 	<commands>
 
 	        <cmd name="FileOpen" _label="Open" hidden="1"
-		_tip="Open a file" pixtype="stock" pixname="gtk-open" accel="*Control*o"/>
+		_tip="Open a file" pixtype="pixbuf" accel="*Control*o"/>
 		
 	        <cmd name="FileSave" _label="Save"
-		_tip="Save the current file" pixtype="stock" pixname="gtk-save"
+		_tip="Save the current file" pixtype="pixbuf"
 		accel="*Ctrl*s"/>
 
 		<cmd name="FileSaveDraft" _label="Save Draft"
-		_tip="Save as draft" pixtype="pixbuf" 
+		_tip="Save as draft" pixtype="pixbuf"
 		accel="*Ctrl**Shift*s"/>
 
 	        <cmd name="FileSaveAs" _label="Save As"
 	        _tip="Save the current file with a different name"
-		pixtype="stock" pixname="gtk-save-as"/>
+		pixtype="pixbuf"/>
 		
 	        <cmd name="FileClose" _label="Close"
-		_tip="Close the current file" pixtype="stock" pixname="gtk-close"
+		_tip="Close the current file" pixtype="pixbuf"
 		accel="*Ctrl*w"/>
 		
 		<cmd name="FileSaveInFolder" _label="Save in folder..."
@@ -32,7 +32,7 @@
 		pixtype="pixbuf"/>
 		
 		<cmd name="DeleteAll" _label="_Delete all"
-		pixtype="stock" pixname="gtk-delete"
+		pixtype="pixbuf"
 		_tip="Delete all but signature"/>
 
 		<cmd name="RequestReceipt" _label="R_equest Read Receipt"
@@ -84,8 +84,7 @@
                 _tip="Encrypt this message with your S/MIME Encryption Certificate"
 		type="toggle" state="0" hidden="1"/>
 		
-		<cmd name="InsertXSendOptions" _tip="Insert Send options"
-    		 pixtype="pixbuf"/>
+		<cmd name="InsertXSendOptions" _tip="Insert Send options"/>
 
 	</commands>
 	
@@ -101,8 +100,8 @@
 
 			<separator f="" name="emailcomposer1"/>
 
-			<menuitem name="FileSave" verb="" _label="_Save" pixtype="stock" pixname="gtk-save"/>
-			<menuitem name="FileSaveAs" verb="" _label="Save _As..." pixtype="stock" pixname="gtk-save-as"/>
+			<menuitem name="FileSave" verb="" _label="_Save"/>
+			<menuitem name="FileSaveAs" verb="" _label="Save _As..."/>
                         <menuitem name="FileSaveDraft" verb="" _label="Save _Draft"/>
 			<placeholder name="Print" delimit="top"/>
 
@@ -134,7 +133,7 @@
 		
                 <submenu name="Insert" _label="I_nsert">
 	                <menuitem name="FileAttach" verb=""
-	                _label="_Attachment..." pixtype="pixbuf"/>
+	                _label="_Attachment..."/>
 			<separator/>
 			<menuitem name="InsertXSendOptions" verb="" _label="_Send Options"/>
 			<separator/>
diff --git a/ui/evolution-subscribe.xml b/ui/evolution-subscribe.xml
index 4a423e7d36..414bfb7001 100644
--- a/ui/evolution-subscribe.xml
+++ b/ui/evolution-subscribe.xml
@@ -3,7 +3,7 @@
     <submenu name="File" _label="_File">
 
         <menuitem name="FileCloseWin" verb=""
-        pixtype="stock" pixname="gtk-close" _label="_Close" accel="*Control*w"/>
+        pixtype="pixbuf" _label="_Close" accel="*Control*w"/>
 
     </submenu>
 
diff --git a/ui/evolution-task-editor.xml b/ui/evolution-task-editor.xml
index 925a1dd7bc..7793e018e8 100644
--- a/ui/evolution-task-editor.xml
+++ b/ui/evolution-task-editor.xml
@@ -61,7 +61,7 @@
 		    <menuitem name="ActionClassPrivate" id="ActionClassPrivate" verb=""/>
 		    <menuitem name="ActionClassConfidential" id="ActionClassConfidential" verb=""/>
 	    </submenu>
-	      <menuitem name="OptionStatus" verb="" _label="_Status Details" pixtype="pixbuf"/>	    
+	      <menuitem name="OptionStatus" verb="" _label="_Status Details"/>	    
     </submenu>
   </menu>
 
diff --git a/ui/evolution-tasks.xml b/ui/evolution-tasks.xml
index b0f278d4fd..e0902b6806 100644
--- a/ui/evolution-tasks.xml
+++ b/ui/evolution-tasks.xml
@@ -1,20 +1,20 @@
 <Root>
   <commands>
     <cmd name="TasksOpenTask" _tip="View the selected task" accel="*Control*o"/>
-    <cmd name="TasksPrint" _tip="Print the list of tasks" pixtype="stock" pixname="gtk-print"
+    <cmd name="TasksPrint" _tip="Print the list of tasks" pixtype="pixbuf"
 	 accel="*Control*p"/>
-    <cmd name="TasksPrintPreview" _tip="Previews the list of tasks to be printed" pixtype="stock" pixname="gtk-print-preview"/>
+    <cmd name="TasksPrintPreview" _tip="Previews the list of tasks to be printed" pixtype="pixbuf"/>
 
-    <cmd name="TasksCut" _tip="Cut selected tasks" accel="*Control*x" pixtype="stock" pixname="gtk-cut"/>
-    <cmd name="TasksCopy" _tip="Copy selected tasks" accel="*Control*c" pixtype="stock" pixname="gtk-copy"/>
-    <cmd name="TasksPaste" _tip="Paste tasks from the clipboard" accel="*Control*v" pixtype="stock" pixname="gtk-paste"/>
+    <cmd name="TasksCut" _tip="Cut selected tasks" accel="*Control*x" pixtype="pixbuf"/>
+    <cmd name="TasksCopy" _tip="Copy selected tasks" accel="*Control*c" pixtype="pixbuf"/>
+    <cmd name="TasksPaste" _tip="Paste tasks from the clipboard" accel="*Control*v" pixtype="pixbuf"/>
     <cmd name="TasksDelete" _tip="Delete selected tasks" accel="*Control*d" sensitive="0"
-         pixtype="stock" pixname="gtk-delete"/>
+         pixtype="pixbuf"/>
     <cmd name="TasksMarkComplete" _tip="Mark selected tasks as complete" accel="*Control*k" sensitive="0"/>
 
     <cmd name="TasksPurge" _label="Purg_e" _tip="Delete completed tasks" accel="*Control*e"/>
     <cmd name="TasksAssign" _label="_Assign Task"/>
-    <cmd name="TasksForward" _label="_Forward as iCalendar" accel="*Control*f"/>
+    <cmd name="TasksForward" _label="_Forward as iCalendar" accel="*Control*f" pixtype="pixbuf"/>
 
     <cmd name="ViewPreview" _tip="Show task preview window" accel="*Control*m" type="toggle"/>
 
@@ -59,22 +59,22 @@
     <submenu name="Actions" _label="_Actions">
 	<menuitem name="TasksPurge" verb=""/>
 	<menuitem name="TasksAssign" verb=""/>
-	<menuitem name="TasksForward" verb="" pixtype="pixbuf"/>
+	<menuitem name="TasksForward" verb=""/>
     </submenu>
     </placeholder>
 
   </menu>
 
   <dockitem name="Toolbar">
-    <toolitem name="Cut" _label="Cut" verb="TasksCut"/>
-    <toolitem name="Copy" _label="Copy" verb="TasksCopy"/>
-    <toolitem name="Paste" _label="Paste" verb="TasksPaste"/>
+    <toolitem name="Cut" _label="Cut" verb="TasksCut" pixtype="pixbuf"/>
+    <toolitem name="Copy" _label="Copy" verb="TasksCopy" pixtype="pixbuf"/>
+    <toolitem name="Paste" _label="Paste" verb="TasksPaste" pixtype="pixbuf"/>
 
     <separator/>
 
-    <toolitem name="Print" _label="Print" verb="TasksPrint"/>
+    <toolitem name="Print" _label="Print" verb="TasksPrint" pixtype="pixbuf"/>
 
-    <toolitem name="Delete" _label="Delete" verb="TasksDelete"/>
+    <toolitem name="Delete" _label="Delete" verb="TasksDelete" pixtype="pixbuf"/>
 
   </dockitem>
 
diff --git a/ui/evolution.xml b/ui/evolution.xml
index f50d74c2ac..db43ae7c6a 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -7,10 +7,10 @@
     <cmd name="FilePageSetup" _label="Page Set_up..." _tip="Set up the page settings for your current printer"/>
 
     <cmd name="FileClose" _label="_Close Window" _tip="Close this window"
-      pixtype="stock" pixname="gtk-close" accel="*Control*w"/>
+      accel="*Control*w"/>
 
     <cmd name="FileExit" _label="_Quit" _tip="Exit the program"
-      pixtype="stock" pixname="gtk-quit" accel="*Control*q"/>
+      accel="*Control*q"/>
 
     <cmd name="ViewButtonsIconText" _label="Icons _and text" 
       type="radio" group="button_display" _tip="Display window buttons with icons and text"/>
@@ -67,7 +67,8 @@
 
       <separator f="" name="eshell4"/>
       
-      <menuitem name="SendReceive" verb="" _label="Send / _Receive" accel="F9"/>
+      <menuitem name="SendReceive" verb="" _label="Send / _Receive"
+	pixtype="pixbuf" accel="F9"/>
 
       <placeholder name="FileOps"/>
 
@@ -98,9 +99,11 @@
 	pixtype="pixbuf"/>
       
       <menuitem name="FileClose" verb=""
-	_label="_Close Window"/>
+	_label="_Close Window"
+        pixtype="pixbuf"/>
 
-      <menuitem name="FileExit" verb="FileExit"/>
+      <menuitem name="FileExit" verb="FileExit"
+	pixtype="pixbuf"/>
     </submenu>
 
     <submenu name="Edit" _label="_Edit">