Index: branches/RC/core/units/categories/categories_tag_processor.php
===================================================================
diff -u -N -r11538 -r11592
--- branches/RC/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 11538)
+++ branches/RC/core/units/categories/categories_tag_processor.php	(.../categories_tag_processor.php)	(revision 11592)
@@ -1125,9 +1125,11 @@
 
 			// link from Front-End to admin, don't remove "index.php"
 			$edit_url = $this->Application->HREF('categories/edit_content', ADMIN_DIRECTORY, $url_params, 'index.php');
-			$button_css = 'font-family: Arial, Verdana; font-size: 9pt; '.$pos_float.' z-index: 99; background-color: #F7C300; color: #CE0031; border: 1px solid #CE0031; padding: 1px 10px 1px 10px; cursor: pointer;';
-			$edit_code = '<div style="'.$button_css.'" onclick="$form_name=\'kf_cont_'.$content->GetID().'\'; open_popup(\'content\', \'OnEdit\', \'categories/edit_content\');">Edit '.(defined('DEBUG_MODE') && DEBUG_MODE ? "({$num})" : '').'</div>';
 
+			$button_image = '<div style="float: left; height: 15px; vertical-align: middle;"><img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/content_mode.gif" width="15" height="16" alt=""/></div>';
+			$button_css = 'vertical-align: middle; font-family: Arial, Verdana; font-size: 13px; '.$pos_float.' z-index: 99; background-color: #FFCC00; color: black; border: 2px solid #FF6E00; padding: 2px 10px; margin-top: -5px; margin-left: -5px; cursor: pointer;';
+			$edit_code = '<div style="border: 1px dashed #FF6E00;"><div style="'.$button_css.'" onclick="$form_name=\'kf_cont_'.$content->GetID().'\'; open_popup(\'content\', \'OnEdit\', \'categories/edit_content\');">' . $button_image . '<div style="margin-left: 3px; float: left; white-space: nowrap; vertical-align: middle;">Edit '.(defined('DEBUG_MODE') && DEBUG_MODE ? " - #{$num}" : '').'</div></div>';
+
 			if (isset($params['forms_later']) && $params['forms_later']) {
 				$tmp = $edit_code;
 				$edit_code = '';
@@ -1154,7 +1156,13 @@
 			$data = $content->GetField('Content');
 		}
 
-		return $edit_code . $this->_replacePageIds($data);
+		$data = $edit_code . $this->_replacePageIds($data);
+
+		if (EDITING_MODE == EDITING_MODE_CMS) {
+			$data .= '</div>';
+		}
+
+		return $data;
 	}
 
 	/**
@@ -1308,9 +1316,10 @@
 		);
 
 		$edit_url = $this->Application->HREF('categories/categories_edit', '/admin', $url_params);
-		$button_css = 'position: absolute; z-index: 1; top: 1; left 1; font-family: Arial, Verdana; font-size: 9px; background-color: #F7C300; color: #CE0031; border: 1px solid #CE0031; width: auto; padding: 2px 10px 2px 10px; cursor: pointer;';
-		$edit_code = '<div style="'.$button_css.'" onmouseover="window.status=\''.$edit_url.'\'; return true" onclick="$form_name=\'kf_'.$page->GetID().'\'; open_popup(\'c\', \'OnEdit\', \'categories/categories_edit\');">Page Properties';
-		$title = $this->PageInfo(array('type' => 'htmlhead_title'));
+		$button_image = '<div style="float: left; height: 15px; vertical-align: middle;"><img src="' . $this->Application->BaseURL() . 'core/admin_templates/img/top_frame/icons/content_mode.gif" width="15" height="16" alt=""/></div>';
+		$button_css = 'position: absolute; z-index: 1; top: 1; left 1; font-family: Arial, Verdana; font-size: 13px; background-color: #CCFF00; color: black; border: 2px solid #A1D0A1; width: auto; padding: 2px 10px; cursor: pointer;';
+		$edit_code = '<div style="'.$button_css.'" onmouseover="window.status=\''.$edit_url.'\'; return true" onclick="$form_name=\'kf_'.$page->GetID().'\'; open_popup(\'c\', \'OnEdit\', \'categories/categories_edit\');">' . $button_image . '<div style="margin-left: 3px; float: left; white-space: nowrap; vertical-align: middle;">Section Properties</div>';
+//		$title = $this->PageInfo(array('type' => 'htmlhead_title'));
 
 		$edit_code .= '<form method="POST" style="display: inline; margin: 0px" name="kf_'.$page->GetID().'" id="kf_'.$page->GetID().'" action="'.$edit_url.'">';
 /*		$edit_code .= '<input type="hidden" name="c_id" value="'.$page->GetID().'"/>';
@@ -1323,18 +1332,6 @@
 
 			$js_url = $this->Application->BaseURL() . 'core/admin_templates/js';
 
-			/*$edit_code .= '
-				<link rel="stylesheet" rev="stylesheet" href="' . $js_url . '/../incs/style.css" type="text/css" />
-
-				<style type="text/css">
-					body {
-						height: auto;
-						margin: 0px;
-					}
-				</style>';*/
-
-/*			$edit_code .= $this->Application->ProcessParsedTag('adm', 'AdminSkin', Array ()) . "\n";*/
-
 			$edit_code .= '<link rel="stylesheet" href="' . $js_url . '/jquery/thickbox/thickbox.css" type="text/css" media="screen"/>' . "\n";
 			$edit_code .= '<script type="text/javascript" src="' . $js_url . '/jquery/jquery.pack.js"></script>' . "\n";
 			$edit_code .= '<script type="text/javascript" src="' . $js_url . '/jquery/jquery-ui.custom.min.js"></script>' . "\n";