Index: branches/unlabeled/unlabeled-1.9.18/core/kernel/utility/debugger/debugger.js
===================================================================
diff -u -r7577 -r7585
--- branches/unlabeled/unlabeled-1.9.18/core/kernel/utility/debugger/debugger.js	(.../debugger.js)	(revision 7577)
+++ branches/unlabeled/unlabeled-1.9.18/core/kernel/utility/debugger/debugger.js	(.../debugger.js)	(revision 7585)
@@ -84,25 +84,37 @@
 	this.DebuggerToolbar.style.filter = "alpha(opacity=" + opacity + ")";
 }
 
+Debugger.prototype.ToolbarClick = function ($button) {
+	switch ($button.id) {
+		case 'dbg_ReloadFrame':
+			self.location.reload();
+			break;
+		
+		case 'dbg_ShowDebugger':
+			this.Toggle();
+			break;
+	}
+}
+
 Debugger.prototype.AddToolbar = function($var_name) {
 	var $span = document.createElement('SPAN');
 	$span.style.position = 'absolute';
 
-	var $toolbar_content = '<input type="button" class="dbg-button" value="Reload Frame" onclick="self.location.reload();" />';
+	var $toolbar_content = '<td class="dbg-button" id="dbg_ReloadFrame" onclick="' + $var_name + '.ToolbarClick(this);">Reload Frame</td>';
 	
 	if (this.ErrorsCount > 0) {
-		$toolbar_content += '|<input type="button" class="dbg-button debug_error" style="font-weight: bold;" value="Show Debugger (' + this.ErrorsCount + ' errors)" onclick="' + $var_name + '.Toggle();"/>';
+		$toolbar_content += '<td class="dbg-separator"></td><td class="dbg-button debug_error" style="font-weight: bold;" id="dbg_ShowDebugger" onclick="' + $var_name + '.ToolbarClick(this);">Show Debugger (' + this.ErrorsCount + ' errors)</td>';
 	}
 	else {
-		$toolbar_content += '<input type="button" class="dbg-button" value="Show Debugger" onclick="' + $var_name + '.Toggle();" />';
+		$toolbar_content += '<td class="dbg-button" id="dbg_ShowDebugger" onclick="' + $var_name + '.ToolbarClick(this);">Show Debugger</td>';
 	}
 	
 	if (this.SQLCount > 0) {
-		$toolbar_content += '|<input type="button" class="dbg-button" value="' + this.SQLCount + ' sqls" />';
+		$toolbar_content += '<td class="dbg-separator"></td><td>' + this.SQLCount + ' sqls</td>';
 	}
 	
-	$span.innerHTML = '<table cellspacing="3" cellpadding="0" class="dbg-toolbar"><tr><td>' + $toolbar_content + '<br /></td></tr></table>';
-
+	$span.innerHTML = '<table cellpadding="0" cellspacing="3" class="dbg-toolbar"><tr>' + $toolbar_content + '</tr></table>';
+	
 	this.DebuggerToolbar = $span;
 	this.SetOpacity(20);
 	$span.onmouseover = function() {