Index: jsf-widgets/src/java/org/sakaiproject/jsf/renderer/ToolBarItemRenderer.java
===================================================================
--- jsf-widgets/src/java/org/sakaiproject/jsf/renderer/ToolBarItemRenderer.java	(revision 122327)
+++ jsf-widgets/src/java/org/sakaiproject/jsf/renderer/ToolBarItemRenderer.java	(working copy)
@@ -47,14 +47,14 @@
     {
         // use default link rendering, after closing open span tag
 	  ResponseWriter writer = context.getResponseWriter();
-	  	writer.write(""); // normaly just close the span
+	  	writer.write("<span>"); // normaly just close the span
       super.encodeBegin(context, component);
     }
     else
     {
         // setup to render the disabled link ourselves - close open span tag after adding inactive attributes
       ResponseWriter writer = context.getResponseWriter();
-      writer.write(""); //normally, add aria and class attributes and close the span
+      writer.write("<span class=\"current\">"); //normally, add aria and class attributes and close the span
     }
   }
 
@@ -95,6 +95,8 @@
     {
         // rendering of end of disabled link taken care of already
     }
+    ResponseWriter writer = context.getResponseWriter();
+    writer.write("</span>");
   }
 
   /**
Index: jsf-widgets/src/java/org/sakaiproject/jsf/renderer/ToolBarRenderer.java
===================================================================
--- jsf-widgets/src/java/org/sakaiproject/jsf/renderer/ToolBarRenderer.java	(revision 122327)
+++ jsf-widgets/src/java/org/sakaiproject/jsf/renderer/ToolBarRenderer.java	(working copy)
@@ -111,14 +111,14 @@
       if (child.isRendered()) {
          if (!first)   
          {
-        	 writer.write("<li><span>");
+        	 writer.write("<li>");
          }
          else
          {
-        	 writer.write("<li class=\"firstToolBarItem\"><span>");
+        	 writer.write("<li class=\"firstToolBarItem\">");
          }
          RendererUtil.encodeRecursive(context, child);
-    	 writer.write("</span></li> ");
+    	 writer.write("</li> ");
          first = false;
       }
     }