diff --git a/UI/Common/UIxToolbar.m b/UI/Common/UIxToolbar.m
index e5878a5f1..c9cc5d866 100644
--- a/UI/Common/UIxToolbar.m
+++ b/UI/Common/UIxToolbar.m
@@ -227,6 +227,24 @@
   return [[[[self context] page] valueForKeyPath:onOffKey] boolValue];
 }
 
+- (NSString *) cssClasses
+{
+  NSMutableArray *cssClasses;
+  NSString *infoClasses;
+
+  cssClasses = [NSMutableArray arrayWithCapacity: 16];
+  if ([self isButtonEnabled])
+    [cssClasses addObject: @"toolbarButton"];
+  else
+    [cssClasses addObject: @"disabledToolbarButton"];
+
+  infoClasses = [[self buttonInfo] objectForKey: @"cssClass"];
+  if ([infoClasses length] > 0)
+    [cssClasses addObject: infoClasses];
+
+  return [cssClasses componentsJoinedByString: @" "];
+}
+
 - (BOOL) isLastGroup {
   return ([toolbarConfig indexOfObject: toolbarGroup]
 	  == ([toolbarConfig count] - 1));
diff --git a/UI/Templates/UIxToolbar.wox b/UI/Templates/UIxToolbar.wox
index a56464a11..04efd3d0f 100644
--- a/UI/Templates/UIxToolbar.wox
+++ b/UI/Templates/UIxToolbar.wox
@@ -10,7 +10,7 @@
       <var:foreach list="toolbarConfig" item="toolbarGroup"
         ><var:foreach list="toolbarGroup" item="buttonInfo"
           ><var:if condition="isButtonEnabled"
-            ><a class="toolbarButton" 
+            ><a var:class="cssClasses"
               var:href="buttonInfo.link"
               var:target="buttonInfo.target"
               var:onclick="buttonInfo.onclick"
@@ -28,7 +28,7 @@
             </a></var:if
             ><var:if condition="isButtonEnabled"
             const:negate="YES"
-            ><span class="disabledToolbarButton"
+            ><span var:class="cssClasses"
               ><img class="buttonImage"
                 var:src="buttonImage"
                 var:alt="buttonTooltip"