diff --git a/ChangeLog b/ChangeLog
index 7fc2af927..bbbb7564d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-08-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Common/UIxToolbar.m ([UIxToolbar -buttonLabel]): reduced the
+	code by invoking UIxComponent's labelForKey:.
+
 	* UI/SOGoUI/UIxComponent.m ([UIxComponent -labelForKey:]): use
 	[self pageResourceManager] instead of [self resourceManager].
 
diff --git a/UI/Common/UIxToolbar.m b/UI/Common/UIxToolbar.m
index a325b8dde..782124924 100644
--- a/UI/Common/UIxToolbar.m
+++ b/UI/Common/UIxToolbar.m
@@ -165,24 +165,13 @@
 
 /* labels */
 
-- (NSString *)buttonLabel {
-  WOResourceManager *rm;
-  NSString          *key, *label;
+- (NSString *) buttonLabel
+{
+  NSString          *key;
   
-  key = [[self buttonInfo] valueForKey:@"label"];
-  
-  /* lookup resource manager */
-  
-  if ((rm = [self pageResourceManager]) == nil)
-    rm = [[WOApplication application] resourceManager];
-  if (rm == nil)
-    [self warnWithFormat:@"missing resource manager!"];
-  
-  /* lookup string */
-  
-  label = [rm stringForKey:key inTableNamed:nil withDefaultValue:key
-              languages:[[self context] resourceLookupLanguages]];
-  return label;
+  key = [[self buttonInfo] valueForKey: @"label"];
+
+  return [self labelForKey: key];
 }
 
 - (id) buttonImage