Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js
===================================================================
diff -u -r7071 -r7090
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js	(.../toolbar.js)	(revision 7071)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js	(.../toolbar.js)	(revision 7090)
@@ -84,19 +84,22 @@
 ToolBarButton.prototype.SetOnMouseOver = function() {
 	this.Container.onmouseover = function() {
 		this.btn.imgObject.src = this.btn.IconsPath() + this.btn.ToolBar.IconPrefix + this.btn.Title + '_f2.gif';
+		this.className = 'toolbar-button-over';
 	};
 }
 
 ToolBarButton.prototype.SetOnMouseOut = function() {
 	this.Container.onmouseout = function() {
 		this.btn.imgObject.src = this.btn.IconsPath() + this.btn.ToolBar.IconPrefix + this.btn.Title + '.gif';
+		this.className = 'toolbar-button';
 	};
 }
 
 ToolBarButton.prototype.SetOnClick = function() {
-	this.Container.onmouseout = function() {
+	// we have SetOnMouseOut for this ???
+	/*this.Container.onmouseout = function() {
 		this.btn.imgObject.src = this.btn.IconsPath() + this.btn.ToolBar.IconPrefix + this.btn.Title + '.gif';
-	};
+	};*/
 	this.Container.inClick = false;
 	if (typeof(this.onClick) != 'function') {
 		this.Container.onclick = function() {
@@ -135,6 +138,7 @@
 	this.Container.onclick = null;
 	this.Container.style.cursor = 'default';
 	this.Enabled = false;
+	this.Container.className = 'toolbar-button-disabled'
 }
 
 ToolBarButton.prototype.Enable = function() {
@@ -144,6 +148,7 @@
 	this.SetOnMouseOut();
 	this.SetOnClick();
 	this.Enabled = true;
+	this.Container.className = 'toolbar-button'
 }
 
 ToolBarButton.prototype.Hide = function() {
@@ -166,7 +171,7 @@
 
 ToolBarSeparator.prototype.GetHTML = function() {
 	var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : '';
-	var padding = this.ToolBar.UseLabels ? '7px' : '2px'
+	var padding = this.ToolBar.UseLabels ? '12px' : '2px'
 	return '<div id="'+this.GetToolID('div')+'" class="toolbar-button" style="padding-top: '+padding+'; height: 32px;" '+add_style+'><img id="' + this.GetToolID() + '" src="' + this.IconsPath() + 'tool_divider.gif"></div>';
 
 	var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : '';