Index: branches/5.2.x/core/admin_templates/js/toolbar.js
===================================================================
diff -u -N -r15905 -r16196
--- branches/5.2.x/core/admin_templates/js/toolbar.js	(.../toolbar.js)	(revision 15905)
+++ branches/5.2.x/core/admin_templates/js/toolbar.js	(.../toolbar.js)	(revision 16196)
@@ -264,19 +264,30 @@
 
 /* ----------- */
 
-function ToolBarMarkup(title, html) //extends ToolBarButton
+function ToolBarMarkup(title, html, $hidden) //extends ToolBarButton
 {
 	this.Title = title;
+	this.Hidden = $hidden ? true : false;
 	this.HTML = html;
 }
 
 ToolBarMarkup.prototype = new ToolBarButton;
 
 ToolBarMarkup.prototype.GetHTML = function() {
-	return this.HTML;
+	var add_style = this.ToolBar.ButtonStyle ? 'style="' + this.ToolBar.ButtonStyle + '"' : '';
+	var padding = this.ToolBar.UseLabels ? '12px' : '2px';
+
+	return '<div id="' + this.GetToolID('div') + '" class="toolbar-button" style="padding-top: ' + padding + '; height: 32px;" ' + add_style + '>' + this.HTML + '</div>';
 }
 
-ToolBarMarkup.prototype.Init = function() { }
+ToolBarMarkup.prototype.Init = function() {
+	this.Container = document.getElementById(this.GetToolID('div')) ? document.getElementById(this.GetToolID('div')) : false;
+
+	if (this.Hidden) {
+		this.Hide();
+	}
+}
+
 ToolBarMarkup.prototype.Enable = function() { }
 ToolBarMarkup.prototype.Disable = function() { }