Index: typo3/templates/tceforms.html
===================================================================
--- typo3/templates/tceforms.html	(revision 9953)
+++ typo3/templates/tceforms.html	(revision )
@@ -12,10 +12,10 @@
 
 <!-- ###FIELDTEMPLATE### begin -->
 <tr ###BGCOLOR_HEAD######CLASSATTR_2###>
-	<td colspan="2" class="formField-header"><span style="color:###FONTCOLOR_HEAD###;"###CLASSATTR_4###><strong>###FIELD_NAME###</strong></span><img name="req_###FIELD_TABLE###_###FIELD_ID###_###FIELD_FIELD###" src="clear.gif" class="t3-TCEforms-reqImg" alt="" /><img name="cm_###FIELD_TABLE###_###FIELD_ID###_###FIELD_FIELD###" src="clear.gif" class="t3-TCEforms-contentchangedImg" alt="" /></td>
+	<td colspan="2" class="formField-header"><span style="color:###FONTCOLOR_HEAD###;"###CLASSATTR_4###><strong>###FIELD_NAME###</strong></span></td>
 </tr>
 <tr ###BGCOLOR######CLASSATTR_1###>
-	<td colspan="2" class="formField-field" valign="top">###FIELD_ITEM######FIELD_PAL_LINK_ICON###</td>
+	<td colspan="2" class="formField-field" valign="top"><img name="cm_###FIELD_TABLE###_###FIELD_ID###_###FIELD_FIELD###" src="clear.gif" class="t3-TCEforms-contentchangedImg" alt="" /><img name="req_###FIELD_TABLE###_###FIELD_ID###_###FIELD_FIELD###" src="clear.gif" class="t3-TCEforms-reqImg" alt="" />###FIELD_ITEM######FIELD_PAL_LINK_ICON###</td>
 </tr>
 <!-- ###FIELDTEMPLATE### end -->
 
@@ -38,4 +38,4 @@
 <tr>
 	<td colspan="2"><table ###TABLE_ATTRIBS###>###CONTENT###</table></td>
 </tr>
-<!-- ###SECTION_WRAP### end -->
\ No newline at end of file
+<!-- ###SECTION_WRAP### end -->
Index: t3lib/class.t3lib_tceforms.php
===================================================================
--- t3lib/class.t3lib_tceforms.php	(revision 10082)
+++ t3lib/class.t3lib_tceforms.php	(revision )
@@ -5149,7 +5149,7 @@
 		}
 
 		if ($this->classScheme[4]) {
-			$fieldAttributes .= ' class="t3-form-palette-field' . $this->classScheme[4] . '"';
+			$fieldAttributes .= ' class="t3-form-palette-field ' . $this->classScheme[4] . '"';
 		}
 
 		$row = 0;
@@ -5169,11 +5169,11 @@
 				$iRow[$row][] = '<span class="t3-form-palette-field-container">' .
 								'<label' . $labelAttributes . '>' .
 								$content['NAME'] .
-								'<img name="req_' . $fieldIdentifierForJs . '" src="clear.gif" class="t3-form-palette-icon-required" alt="" />' .
-								'<img name="cm_' . $fieldIdentifierForJs . '" src="clear.gif" class="t3-form-palette-icon-contentchanged" alt="" />' .
 								'</label>' .
 								'<span' . $fieldAttributes . '>' .
+									'<img name="cm_' . $fieldIdentifierForJs . '" src="clear.gif" class="t3-form-palette-icon-contentchanged" alt="" />' .
+									'<img name="req_' . $fieldIdentifierForJs . '" src="clear.gif" class="t3-form-palette-icon-required" alt="" />' .
-								$content['ITEM'] .
+									$content['ITEM'] .
 								'</span>' .
 								'</span>';
 			}
Index: typo3/sysext/t3skin/stylesheets/structure/element_tceforms.css
===================================================================
--- typo3/sysext/t3skin/stylesheets/structure/element_tceforms.css	(revision 9953)
+++ typo3/sysext/t3skin/stylesheets/structure/element_tceforms.css	(revision )
@@ -4,11 +4,13 @@
 $Id: element_tceforms.css 9953 2010-12-28 16:44:46Z flyguide $
 - - - - - - - - - - - - - - - - - - - - - */
 img.t3-TCEforms-reqImg {
-	display: inline-block;
+	display: block;
+	position: absolute;
+	left: 14px;
+	top: 28%;
+	z-index: 3000;
 	height: 16px;
-	margin-left: 3px;
-	margin-right: 3px;
-	margin-top: 4px;
+	margin-right: 2px;
 	width: 16px;
 }
 
@@ -20,30 +22,51 @@
 }
 
 img.t3-TCEforms-contentchangedImg {
-	display: inline-block;
-	margin-bottom: 2px;
+	display: block;
+	position: absolute;
+	left: 4px;
+	top: 32%;
+	z-index: 4000;
 	width: 7px;
 }
 
 .t3-form-palette-icon-required {
-	display: inline-block;
+	display: block;
+	position: absolute;
+	left: 4px;
+	top: 26%;
+	z-index: 3000;
 	height: 16px;
 	margin-right: 2px;
 	width: 16px;
 }
 /* renamed to .t3-form-palette-icon-required, lines below kept for backwards-compatibility */
 img.t3-TCEforms-reqPaletteImg {
-	display: inline-block;
+	display: block;
+	position: absolute;
+	left: 14px;
+	top: 30%;
+	z-index: 3000;
 	height: 16px;
 	margin-right: 2px;
 	width: 16px;
 }
 
 .t3-form-palette-icon-contentchanged {
+	display: block;
+	position: absolute;
+	left: -6px;
+	top: 30%;
+	z-index: 4000;
 	width: 7px;
 }
 /* renamed to .t3-form-palette-icon-contentchanged, lines below kept for backwards-compatibility */
 img.t3-TCEforms-contentchangedPaletteImg {
+	display: block;
+	position: absolute;
+	left: 4px;
+	top: 30%;
+	z-index: 4000;
 	width: 7px;
 }
 
@@ -132,6 +155,8 @@
 .checkbox,
 .checkbox:hover {
 	margin: 4px 0 4px 2px;
+	position: relative;
+	z-index: 3500;
 }
 
 table.typo3-TCEforms .class-main1 td,
@@ -163,6 +188,8 @@
 
 table.typo3-TCEforms td.formField-header,
 table.typo3-TCEforms td.formField-field {
+	display: block;
+	position: relative;
 	padding-left: 10px;
 }
 
@@ -175,8 +202,18 @@
 	margin: 4px 2px 4px 1px;
 	padding: 1px;
 	vertical-align: middle;
+	position: relative;
 }
 
+table.typo3-TCEforms .formField:focus,
+table.typo3-TCEforms .formField1:focus,
+table.typo3-TCEforms .formField2:focus,
+table.typo3-TCEforms .formField3:focus,
+table.typo3-TCEforms .formField4:focus,
+table.typo3-TCEforms .formField5:focus {
+	z-index: 3500;
+}
+
 table.typo3-TCEforms .wrapperTable,
 table.typo3-TCEforms .wrapperTable1,
 table.typo3-TCEforms .wrapperTable2,
@@ -261,7 +298,8 @@
 }
 
 .t3-form-palette-field-container .t3-form-palette-field-label, .t3-form-palette-field-container .t3-form-palette-field {
-	display:block;
+	display: block;
+	position: relative;
 }
 
 .typo3-TCEforms .typo3-csh-link {
Index: typo3/sysext/t3skin/stylesheets/structure/main_content.css
===================================================================
--- typo3/sysext/t3skin/stylesheets/structure/main_content.css	(revision 7974)
+++ typo3/sysext/t3skin/stylesheets/structure/main_content.css	(revision )
@@ -94,7 +94,6 @@
 .checkbox:hover {
 	height: 13px;
 	margin-right: 5px;
-	overflow: hidden;
 	vertical-align: middle;
 	width: 13px;
 }
Index: typo3/sysext/t3skin/stylesheets/visual/element_tceforms.css
===================================================================
--- typo3/sysext/t3skin/stylesheets/visual/element_tceforms.css	(revision 10078)
+++ typo3/sysext/t3skin/stylesheets/visual/element_tceforms.css	(revision )
@@ -80,7 +80,7 @@
 
 .t3-tceforms-input-wrapper-hover .t3-tceforms-input-clearer,
 .t3-tceforms-input-wrapper-datetime-hover .t3-tceforms-input-clearer {
-	z-index: 3000;
+	z-index: 3700;
 }
 
 table.typo3-TCEforms table#typo3-altdoc-header input:hover,