Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js
===================================================================
diff -u -r7027 -r7029
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js	(.../toolbar.js)	(revision 7027)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js	(.../toolbar.js)	(revision 7029)
@@ -55,7 +55,8 @@
 }
 
 ToolBarButton.prototype.GetHTML = function() {
-	var o = '<div class="toolbar-button" id="'+this.GetToolID('div')+'">'
+	var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : '';
+	var o = '<div class="toolbar-button" id="'+this.GetToolID('div')+'" '+add_style+'>'
 	o += '<img id="' + this.GetToolID() + '" src="' + this.IconsPath() + this.ToolBar.IconPrefix + this.Title + '.gif" title="' + this.Alt + '">';
 	o += '<br/>'+this.Label;
 	o += '</div>'
@@ -164,11 +165,13 @@
 ToolBarSeparator.prototype = new ToolBarButton;
 
 ToolBarSeparator.prototype.GetHTML = function() {
-	return '<div class="toolbar-button"><img id="' + this.GetToolID() + '" src="' + this.IconsPath() + 'tool_divider.gif"></div>';
+	var add_style = this.ToolBar.ButtonStyle ? 'style="'+this.ToolBar.ButtonStyle+'"' : '';
+	return '<div  id="'+this.GetToolID('div')+'" class="toolbar-button" '+add_style+'><img id="' + this.GetToolID() + '" src="' + this.IconsPath() + 'tool_divider.gif"></div>';
 }
 
 ToolBarSeparator.prototype.Init = function() {
 	img = document.getElementById(this.ToolBar.IconPrefix + this.Title);
+	this.Container = document.getElementById(this.GetToolID('div')) ? document.getElementById(this.GetToolID('div')) : false;
 	this.imgObject = img;
 	img.btn = this;
 }