Index: typo3/sysext/cms/tslib/class.tslib_content.php
===================================================================
--- typo3/sysext/cms/tslib/class.tslib_content.php	(Revision 9642)
+++ typo3/sysext/cms/tslib/class.tslib_content.php	(Arbeitskopie)
@@ -3122,7 +3122,8 @@
 	 * @return	string		The processed input value
 	 */
 	public function stdWrap_editIcons($content = '', $conf = array()) {
-		if ($GLOBALS['TSFE']->beUserLogin) {
+		if ($GLOBALS['TSFE']->beUserLogin && $conf['editIcons']) {
+			$conf['editIcons.'] = $conf['editIcons.'] ? $conf['editIcons.'] : array();
 			$content = $this->editIcons($content, $conf['editIcons'], $conf['editIcons.']);
 		}
 		return $content;
@@ -7566,7 +7567,7 @@
 	 * @param	string		Additional URL parameters for the link pointing to alt_doc.php
 	 * @return	string		The input content string, possibly with edit icons added (not necessarily in the end but just after the last string of normal content.
 	 */
-	function editIcons($content, $params, $conf = array(), $currentRecord = '', $dataArr = array(), $addUrlParamStr = '') {
+	function editIcons($content, $params, array $conf = array(), $currentRecord = '', $dataArr = array(), $addUrlParamStr = '') {
 		if ($GLOBALS['TSFE']->beUserLogin && ($GLOBALS['BE_USER']->frontendEdit instanceof t3lib_frontendedit)) {
 			if (!$currentRecord) {
 				$currentRecord = $this->currentRecord;
Index: typo3/sysext/cms/tslib/content/class.tslib_content_imagetext.php
===================================================================
--- typo3/sysext/cms/tslib/content/class.tslib_content_imagetext.php	(Revision 9642)
+++ typo3/sysext/cms/tslib/content/class.tslib_content_imagetext.php	(Arbeitskopie)
@@ -398,6 +398,7 @@
 				+ $cap;
 
 				// Edit icons:
+			$conf['editIcons.'] = $conf['editIcons.'] ? $conf['editIcons.'] : array();
 			$editIconsHTML = $conf['editIcons'] && $GLOBALS['TSFE']->beUserLogin
 				? $this->cObj->editIcons('', $conf['editIcons'], $conf['editIcons.'])
 				: '';
Index: typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php
===================================================================
--- typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php	(Revision 9642)
+++ typo3/sysext/css_styled_content/pi1/class.tx_cssstyledcontent_pi1.php	(Arbeitskopie)
@@ -708,6 +708,7 @@
 		}
 
 			// Edit icons:
+		$conf['editIcons.'] = $conf['editIcons.'] ? $conf['editIcons.'] : array();
 		$editIconsHTML = $conf['editIcons']&&$GLOBALS['TSFE']->beUserLogin ? $this->cObj->editIcons('',$conf['editIcons'],$conf['editIcons.']) : '';
 
 			// If noRows, we need multiple imagecolumn wraps