Index: branches/RC/core/kernel/nparser/nparser.php
===================================================================
diff -u -r11402 -r11610
--- branches/RC/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 11402)
+++ branches/RC/core/kernel/nparser/nparser.php	(.../nparser.php)	(revision 11610)
@@ -492,8 +492,12 @@
 
 	function DecorateBlock($block_content, $block_params, $is_template = false)
 	{
-		static $used_ids = Array ();
+		static $used_ids = Array (), $base_url = null;
 
+		if (!isset($base_url)) {
+			$base_url = $this->Application->BaseURL();
+		}
+
 //		$prepend = '[name: ' . $block_params['name'] . '] [params: ' . implode(', ', array_keys($block_params)) . ']';
 
 		$decorate = false;
@@ -559,11 +563,21 @@
 
 		// prepare parameter string
 		$param_string = $block_name . ':' . $function_name;
-		$block_editor = '<div id="' . $container_id . '" params="' . $param_string . '" class="block-container">
-							<span class="edit-block" id="' . $container_id . '_btn">edit</span><br />
-							%s
-						</div>';
 
+
+		$block_editor = '
+			<div id="' . $container_id . '" params="' . $param_string . '" class="block-edit-btn-container">
+				<div class="cms-edit-btn">
+					<div class="cms-btn-image">
+						<img src="' . $base_url . 'core/admin_templates/img/top_frame/icons/content_mode.gif" width="15" height="16" alt=""/>
+					</div>
+					<div class="cms-btn-text" id="' . $container_id . '_btn">Edit</div>
+				</div>
+				<div class="cms-btn-content">
+					%s
+				</div>
+			</div>';
+
 		// 1 - text before, 2 - open tag, 3 - open tag attributes, 4 - content inside tag, 5 - closing tag, 6 - text after closing tag
 		if (preg_match('/^(\s*)<(td|span)(.*?)>(.*)<\/(td|span)>(.*)$/is', $block_content, $regs)) {
 			// div inside span -> put div outside span