diff --git a/UI/AdministrationUI/Toolbars/UIxAdministration.toolbar b/UI/AdministrationUI/Toolbars/UIxAdministration.toolbar
index 73499716d..2502cb20a 100644
--- a/UI/AdministrationUI/Toolbars/UIxAdministration.toolbar
+++ b/UI/AdministrationUI/Toolbars/UIxAdministration.toolbar
@@ -1,6 +1,7 @@
 ( /* the toolbar groups -*-cperl-*- */
   ( { link = "#";
       label = "Help";
+      tooltip = "Help";
       onclick = "help(this);";
       image = "properties.png"; }
   )
diff --git a/UI/PreferencesUI/Toolbars/UIxPreferences.toolbar b/UI/PreferencesUI/Toolbars/UIxPreferences.toolbar
index 498ead765..300f6775b 100644
--- a/UI/PreferencesUI/Toolbars/UIxPreferences.toolbar
+++ b/UI/PreferencesUI/Toolbars/UIxPreferences.toolbar
@@ -1,11 +1,13 @@
 ( /* the toolbar groups -*-cperl-*- */
   ( { link = "#";
       label = "Save and Close";
+      tooltip = "Save and Close";
       onclick = "return savePreferences(event);";
       image = "tb-compose-save-flat-24x24.png"; },
     { link = "#";
       isSafe = NO;
       label = "Close";
+      tooltip = "Close";
       onclick = "return onCloseButtonClick();";
       image = "tb-mail-stop-flat-24x24.png"; }
   )
diff --git a/UI/Scheduler/Toolbars/SOGoAppointmentObject.toolbar b/UI/Scheduler/Toolbars/SOGoAppointmentObject.toolbar
index b7946fbb3..231673b18 100644
--- a/UI/Scheduler/Toolbars/SOGoAppointmentObject.toolbar
+++ b/UI/Scheduler/Toolbars/SOGoAppointmentObject.toolbar
@@ -1,19 +1,23 @@
 ( /* the toolbar groups -*-cperl-*- */
   ( { link = "#";
       label = "Save and Close";
+      tooltip = "Save and Close";
       onclick = "return saveEvent();";
       image = "tb-compose-save-flat-24x24.png"; },
     { link = "#";
       label = "Invite Attendees";
+      tooltip = "Invite Attendees";
       onclick = "return onPopupAttendeesWindow();";
       image = "tb-compose-contacts-flat-24x24.png"; },
     { link = "#";
       hasMenu = YES;
       label = "Privacy";
+      tooltip = "Privacy";
       onclick = "return onSelectClassification(event);";
       image = "tb-compose-security-flat-24x24.png"; },
     { link = "#";
       label = "Attach";
+      tooltip = "Attach";
       onclick = "return onPopupAttachWindow();";
       image = "tb-compose-attach-flat-24x24.png"; } )
 )
diff --git a/UI/Scheduler/Toolbars/SOGoComponentClose.toolbar b/UI/Scheduler/Toolbars/SOGoComponentClose.toolbar
index 571e1f6a0..caaa26a39 100644
--- a/UI/Scheduler/Toolbars/SOGoComponentClose.toolbar
+++ b/UI/Scheduler/Toolbars/SOGoComponentClose.toolbar
@@ -2,6 +2,7 @@
   ( { link = "#";
       isSafe = NO;
       label = "Close";
+      tooltip = "Close";
       onclick = "window.close(); return false;";
       image = "tb-mail-stop-flat-24x24.png"; } )
 )
diff --git a/UI/Scheduler/Toolbars/SOGoTaskObject.toolbar b/UI/Scheduler/Toolbars/SOGoTaskObject.toolbar
index 28ea48756..2375b1b36 100644
--- a/UI/Scheduler/Toolbars/SOGoTaskObject.toolbar
+++ b/UI/Scheduler/Toolbars/SOGoTaskObject.toolbar
@@ -1,15 +1,18 @@
 ( /* the toolbar groups -*-cperl-*- */
   ( { link = "#";
       label = "Save and Close";
+      tooltip = "Save and Close";
       onclick = "return saveEvent();";
       image = "tb-compose-save-flat-24x24.png"; },
     { link = "#";
       hasMenu = YES;
       label = "Privacy";
+      tooltip = "Privacy";
       onclick = "return onSelectClassification(event);";
       image = "tb-compose-security-flat-24x24.png"; },
     { link = "#";
       label = "Attach";
+      tooltip = "Attach";
       onclick = "return onPopupAttachWindow();";
       image = "tb-compose-attach-flat-24x24.png"; } )
 )