Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js
===================================================================
diff -u -r7029 -r7071
--- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js	(.../toolbar.js)	(revision 7029)
+++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/js/toolbar.js	(.../toolbar.js)	(revision 7071)
@@ -58,7 +58,7 @@
 	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;
+	if (this.ToolBar.UseLabels) o += '<br/>'+this.Label;
 	o += '</div>'
 	return o;
 }
@@ -166,7 +166,11 @@
 
 ToolBarSeparator.prototype.GetHTML = function() {
 	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>';
+	var padding = this.ToolBar.UseLabels ? '7px' : '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+'"' : '';
+	return '<div id="'+this.GetToolID('div')+'" class="toolbar-button" style="border: 1px solid black; height: 100%;" '+add_style+'><img id="' + this.GetToolID() + '" src="' + this.IconsPath() + 'tool_divider.gif"></div>';
 }
 
 ToolBarSeparator.prototype.Init = function() {
@@ -204,6 +208,7 @@
 	this.Module = $module ? $module : 'core';
 	this.IconPrefix = icon_prefix ? icon_prefix : 'tool_';
 	this.Buttons = new Array();
+	this.UseLabels = $use_toolbarlabels ? $use_toolbarlabels : false;
 }
 
 ToolBar.prototype.AddButton = function(a_button)