Index: jsf-widgets/src/java/org/sakaiproject/jsf/renderer/ToolBarRenderer.java
===================================================================
--- jsf-widgets/src/java/org/sakaiproject/jsf/renderer/ToolBarRenderer.java	(revision 126331)
+++ jsf-widgets/src/java/org/sakaiproject/jsf/renderer/ToolBarRenderer.java	(working copy)
@@ -33,6 +33,7 @@
 import javax.faces.context.ResponseWriter;
 import javax.faces.render.Renderer;
 
+import org.sakaiproject.jsf.component.ToolBarItemComponent;
 import org.sakaiproject.jsf.util.RendererUtil;
 
 /**
@@ -111,12 +112,18 @@
       if (child.isRendered()) {
          if (!first)   
          {
-        	 writer.write("<li><span>");
+        	 writer.write("<li>");
          }
          else
          {
-        	 writer.write("<li class=\"firstToolBarItem\"><span>");
+        	 writer.write("<li class=\"firstToolBarItem\">");
          }
+         if (!"javax.faces.Link".equals(child.getRendererType())) {
+             // basically - if it is not a link, it is probably the current item
+             writer.write("<span class=\"current\">");
+         } else {
+             writer.write("<span>");
+         }
          RendererUtil.encodeRecursive(context, child);
     	 writer.write("</span></li> ");
          first = false;