Index: t3lib/stddb/tables.php
===================================================================
--- t3lib/stddb/tables.php	(Revision 7809)
+++ t3lib/stddb/tables.php	(Arbeitskopie)
@@ -168,8 +168,9 @@
 			'199' => 'apps-pagetree-spacer',
 			'199-hideinmenu' => 'apps-pagetree-spacer-hideinmenu',
 			'254' => 'apps-pagetree-folder-default',
-			'254-hideinmenu' => 'apps-pagetree-folder-default-hideinmenu',
+			'254-hideinmenu' => 'apps-pagetree-folder-default',
 			'255' => 'apps-pagetree-page-recycler',
+			'255-hideinmenu' => 'apps-pagetree-page-recycler',
 			'default' => 'apps-pagetree-page-default',
 			
 		),
@@ -782,8 +783,8 @@
 	'status-system-extension-required',
 	'status-overlay-scheduled',
 	'status-version-34',
-	'status-status-reference-soft',
-	'status-status-reference-hard',
+	'status-reference-soft',
+	'status-reference-hard',
 	'status-version-43',
 	'status-version-2',
 	'status-version-35',
Index: t3lib/class.t3lib_recordlist.php
===================================================================
--- t3lib/class.t3lib_recordlist.php	(Revision 7809)
+++ t3lib/class.t3lib_recordlist.php	(Arbeitskopie)
@@ -147,15 +147,12 @@
 			<td nowrap="nowrap" class="col-icon">';
 
 			if (!$h)	{
-#				$out.='<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/halfline.gif','width="18" height="8"').' alt="" />';
 				$out.='<img src="clear.gif" width="1" height="8" alt="" />';
 			} else {
 				for ($a=0;$a<$h;$a++)	{
 					if (!$a)	{
-#						$out.= $altLine ? $altLine : '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/line.gif','width="18" height="16"').' alt="" />';
 						if ($icon)	$out.= $icon;
 					} else {
-#						$out.= $altLine ? $altLine :'<br /><img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/ol/line.gif','width="18" height="16"').' alt="" />';
 					}
 				}
 			}
Index: t3lib/class.t3lib_tceforms.php
===================================================================
--- t3lib/class.t3lib_tceforms.php	(Revision 7809)
+++ t3lib/class.t3lib_tceforms.php	(Arbeitskopie)
@@ -1080,18 +1080,24 @@
 		if (in_array('date', $evalList)) {
 			$inputId = uniqid('tceforms-datefield-');
 			$cssClasses[] = 'tceforms-textfield tceforms-datefield';
-			$fieldAppendix = '<img' . t3lib_iconWorks::skinImg(
-				$this->backPath, 'gfx/datepicker.gif', '', 0)
-				. ' style="cursor:pointer; vertical-align:middle;" alt=""'
-				. ' id="picker-' . $inputId . '" />';
+			$fieldAppendix = t3lib_iconWorks::getSpriteIcon(
+				'actions-edit-pick-date',
+				array(
+					'style' => 'cursor:pointer;',
+					'id' => 'picker-' . $inputId
+				)
+			);
 
 		} elseif (in_array('datetime', $evalList)) {
 			$inputId = uniqid('tceforms-datetimefield-');
 			$cssClasses[] = 'tceforms-textfield tceforms-datetimefield';
-			$fieldAppendix = '<img' . t3lib_iconWorks::skinImg(
-				$this->backPath, 'gfx/datepicker.gif', '', 0)
-				. ' style="cursor:pointer; vertical-align:middle;" alt=""'
-				. ' id="picker-' . $inputId . '" />';
+			$fieldAppendix = t3lib_iconWorks::getSpriteIcon(
+				'actions-edit-pick-date',
+				array(
+					'style' => 'cursor:pointer;',
+					'id' => 'picker-' . $inputId
+				)
+			);
 
 		} elseif (in_array('timesec', $evalList)) {
 			$inputId = uniqid('tceforms-timesecfield-');
@@ -2183,8 +2189,18 @@
 						$absFilePath = t3lib_div::getFileAbsFileName($config['uploadfolder'] ? $config['uploadfolder'] . '/' . $imgPath : $imgPath);
 
 						$fI = pathinfo($imgPath);
-						$fileIcon = t3lib_BEfunc::getFileIcon(strtolower($fI['extension']));
-						$fileIcon = '<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/fileicons/'.$fileIcon,'width="18" height="16"').' class="absmiddle" title="'.htmlspecialchars($fI['basename'].($absFilePath && @is_file($absFilePath) ? ' ('.t3lib_div::formatSize(filesize($absFilePath)).'bytes)' : ' - FILE NOT FOUND!')).'" alt="" />';
+						$fileIcon = t3lib_iconWorks::getSpritIconForFile(
+							strtolower($fI['extension']),
+							array(
+								'title' => htmlspecialchars(
+									$fI['basename'] . 
+									($absFilePath && @is_file($absFilePath) 
+										? ' (' . t3lib_div::formatSize(filesize($absFilePath)) . 'bytes)' : 
+										' - FILE NOT FOUND!'
+									)
+								)
+							)
+						);
 
 						$imgs[] = '<span class="nobr">'.t3lib_BEfunc::thumbCode($rowCopy,$table,$field,$this->backPath,'thumbs.php',$config['uploadfolder'],0,' align="middle"').
 									($absFilePath ? $this->getClickMenu($fileIcon, $absFilePath) : $fileIcon).
@@ -2281,7 +2297,18 @@
 					if (!$disabled && $show_thumbs)	{
 						$rr = t3lib_BEfunc::getRecordWSOL($this_table,$this_uid);
 						$imgs[] = '<span class="nobr">'.
-								$this->getClickMenu(t3lib_iconWorks::getIconImage($this_table,$rr,$this->backPath,'align="top" title="'.htmlspecialchars(t3lib_BEfunc::getRecordPath($rr['pid'],$perms_clause,15)).' [UID: '.$rr['uid'].']"'),$this_table, $this_uid).
+								$this->getClickMenu(
+									t3lib_iconWorks::getSpriteIconForRecord(
+										$this_table,
+										$rr,
+										array(
+											'style' => 'vertical-align:top',
+											'title' => htmlspecialchars(t3lib_BEfunc::getRecordPath($rr['pid'], $perms_clause, 15) . ' [UID: ' . $rr['uid'] . ']"')
+										)
+									),
+									$this_table,
+									$this_uid
+								) .
 								'&nbsp;'.
 								t3lib_BEfunc::getRecordTitle($this_table,$rr,TRUE).' <span class="typo3-dimmed"><em>['.$rr['uid'].']</em></span>'.
 								'</span>';
@@ -2756,7 +2783,6 @@
 									</td>
 									<td align="right">'.
 										($mayRestructureFlexforms ? t3lib_iconWorks::getSpriteIcon('actions-move-move', array('title' => 'Drag to Move')) : '').
-									#	'<a href="#" onclick="'.htmlspecialchars($onClickCopy).'"><img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/clip_copy.gif','width="12" height="12"').' alt="Copy" title="Copy" /></a>'.	// DISABLED - see what above in definition of variable $onClickCopy
 										($mayRestructureFlexforms ? '<a href="#" onclick="'.htmlspecialchars($onClickRemove).'">'.t3lib_iconWorks::getSpriteIcon('actions-edit-delete', array('title' => 'Delete')) : '').
 									'</td>
 									</tr>
@@ -3655,7 +3681,7 @@
 				}
 				$aOnClick.= 'return false;';
 				$icons['R'][]='<a href="#" onclick="'.htmlspecialchars($aOnClick).'">'.
-						t3lib_iconWorks::getSpriteIcon('actions-edit-paste', array('title' => htmlspecialchars(sprintf($this->getLL('l_clipInsert_' . ($mode == 'db' ? 'db' : 'file')), count($clipElements))))) . 
+						t3lib_iconWorks::getSpriteIcon('actions-document-paste-into', array('title' => htmlspecialchars(sprintf($this->getLL('l_clipInsert_' . ($mode == 'db' ? 'db' : 'file')), count($clipElements))))) . 
 				'</a>';
 			}
 			$rOnClick = $rOnClickInline.'setFormValueManipulate(\''.$fName.'\',\'Remove\'); return false';
Index: t3lib/class.t3lib_tceforms_inline.php
===================================================================
--- t3lib/class.t3lib_tceforms_inline.php	(Revision 7809)
+++ t3lib/class.t3lib_tceforms_inline.php	(Arbeitskopie)
@@ -634,8 +634,12 @@
 						$style = ' style="'.$config['inline']['inlineNewButtonStyle'].'"';
 					}
 					$cells['new']='<a href="#" onclick="'.htmlspecialchars($onClick).'"'.$class.$style.'>'.
-							'<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/new_'.($isPagesTable?'page':'el').'.gif','width="'.($isPagesTable?13:11).'" height="12"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:new'.($isPagesTable?'Page':'Record'),1).'" alt="" />'.
-							'</a>';
+						t3lib_iconWorks::getSpriteIcn('actions-' . ($isPagesTable? 'page' :'document') . '-new',
+							array(
+								'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:new' . ($isPagesTable ? 'Page' : 'Record' ), 1)
+							)
+						).
+						'</a>';
 				}
 			}
 
@@ -665,12 +669,24 @@
 				$onClick = "return inline.enableDisableRecord('".$nameObjectFtId."')";
 				if ($rec[$hiddenField])	{
 					$cells['hide.unhide']='<a href="#" onclick="'.htmlspecialchars($onClick).'">'.
-							'<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/button_unhide.gif','width="11" height="10"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:unHide'.($isPagesTable?'Page':''),1).'" alt="" id="'.$nameObjectFtId.'_disabled" />'.
-							'</a>';
+						t3lib_iconWorks::getSpriteIcon(
+							'actions-edit-unhide',
+							array(
+								'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:unHide' . ($isPagesTable ? 'Page' : ''), 1),
+								'id' => $nameObjectFtId . '_disabled'
+							)
+						) .
+						'</a>';
 				} else {
 					$cells['hide.hide']='<a href="#" onclick="'.htmlspecialchars($onClick).'">'.
-							'<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/button_hide.gif','width="11" height="10"').' title="'.$GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:hide'.($isPagesTable?'Page':''),1).'" alt="" id="'.$nameObjectFtId.'_disabled" />'.
-							'</a>';
+						t3lib_iconWorks::getSpriteIcon(
+							'actions-edit-hide',
+							array(
+								'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_mod_web_list.xml:hide' . ($isPagesTable ? 'Page' : ''), 1),
+								'id' => $nameObjectFtId . '_disabled'
+							)
+						) .
+						'</a>';
 				}
 			}
 
@@ -694,7 +710,7 @@
 			// If the record is edit-locked	by another user, we will show a little warning sign:
 		if ($lockInfo=t3lib_BEfunc::isRecordLocked($foreign_table,$rec['uid']))	{
 			$cells['locked']='<a href="#" onclick="'.htmlspecialchars('alert('.$GLOBALS['LANG']->JScharCode($lockInfo['msg']).');return false;').'">'.
-					t3lib_iconWorks::getSpriteIcon('status-record-warning', array('title' => htmlspecialchars($lockInfo['msg']))) .
+					t3lib_iconWorks::getSpriteIcon('status-warning-in-use', array('title' => htmlspecialchars($lockInfo['msg']))) .
 					'</a>';
 		}
 
@@ -902,8 +918,7 @@
 		switch($type) {
 			case 'newRecord':
 				$title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:cm.createnew', 1);
-				$iconFile = 'gfx/new_el.gif';
-				// $iconAddon = 'width="11" height="12"';
+				$icon = 'actions-document-new';
 				$className = 'typo3-newRecordLink';
 				$attributes['class'] = 'inlineNewButton '.$this->inlineData['config'][$nameObject]['md5'];
 				$attributes['onclick'] = "return inline.createNewRecord('$objectPrefix')";
@@ -916,22 +931,22 @@
 				break;
 			case 'localize':
 				$title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.xml:localizeAllRecords', 1);
-				$iconFile = 'gfx/localize_el.gif';
+				$icon = 'actions-document-localize';
 				$className = 'typo3-localizationLink';
 				$attributes['onclick'] = "return inline.synchronizeLocalizeRecords('$objectPrefix', 'localize')";
 				break;
 			case 'synchronize':
 				$title = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_misc.xml:synchronizeWithOriginalLanguage', 1);
-				$iconFile = 'gfx/synchronize_el.gif';
+				$icon = 'actions-document-synchronize';
 				$className = 'typo3-synchronizationLink';
 				$attributes['class'] = 'inlineNewButton '.$this->inlineData['config'][$nameObject]['md5'];
 				$attributes['onclick'] = "return inline.synchronizeLocalizeRecords('$objectPrefix', 'synchronize')";
 				break;
 		}
 			// Create the link:
-		$icon = ($iconFile ? '<img'.t3lib_iconWorks::skinImg($this->backPath, $iconFile, $iconAddon).' alt="'.htmlspecialchars($title.$titleAddon).'" />' : '');
-		$link = $this->wrapWithAnchor($icon.$title.$titleAddon, '#', $attributes);
-		return '<div'.($className ? ' class="'.$className.'"' : '').'>'.$link.'</div>';
+		$icon = ($icon ? t3lib_iconWorks::getSpriteIcon($icon, array('title' => htmlspecialchars($title.$titleAddon))) : '');
+		$link = $this->wrapWithAnchor($icon . $title . $titleAddon, '#', $attributes);
+		return '<div' . ($className ? ' class="' . $className . '"' : '').'>' . $link . '</div>';
 	}
 
 
Index: t3lib/class.t3lib_fullsearch.php
===================================================================
--- t3lib/class.t3lib_fullsearch.php	(Revision 7809)
+++ t3lib/class.t3lib_fullsearch.php	(Arbeitskopie)
@@ -664,9 +664,9 @@
 			$out .= '<a href="#" onClick="'.t3lib_BEfunc::editOnClick($params, $GLOBALS['BACK_PATH'], t3lib_div::getIndpEnv('REQUEST_URI').t3lib_div::implodeArrayForUrl('SET', (array)t3lib_div::_POST('SET'))).'">' . t3lib_iconWorks::getSpriteIcon('actions-document-open') .  '</a>';
 		} else {
 			$out.= '<a href="'.t3lib_div::linkThisUrl($GLOBALS['BACK_PATH'].'tce_db.php', array('cmd['.$table.']['.$row['uid'].'][undelete]' => '1', 'redirect' => t3lib_div::linkThisScript(array()))).'">';
-			$out.= t3lib_iconWorks::getSpriteIcon('action-undelete-button', array('title' => 'undelete only')) . '</a>';
+			$out.= t3lib_iconWorks::getSpriteIcon('actions-edit-restore', array('title' => 'undelete only')) . '</a>';
 			$out.= '<a href="'.t3lib_div::linkThisUrl($GLOBALS['BACK_PATH'].'tce_db.php', array('cmd['.$table.']['.$row['uid'].'][undelete]' => '1', 'redirect' => t3lib_div::linkThisUrl('alt_doc.php', array('edit['.$table.']['.$row['uid'].']' => 'edit', 'returnUrl' => t3lib_div::linkThisScript(array()))))).'">';
-			$out.= t3lib_iconWorks::getSpriteIcon('actions-edit-delete', array('title' => 'undelete and edit')) . '</a>';
+			$out.= t3lib_iconWorks::getSpriteIcon('actions-edit-restore-edit', array('title' => 'undelete and edit')) . '</a>';
 		}
 		$_params = array($table=>$row);
 		if (is_array($this->hookArray['additionalButtons']))	{
Index: typo3/class.file_list.inc
===================================================================
--- typo3/class.file_list.inc	(Revision 7809)
+++ typo3/class.file_list.inc	(Arbeitskopie)
@@ -657,7 +657,7 @@
 		$elFromTable = $this->clipObj->elFromTable('_FILE');
 		if (@is_dir($fullIdent) && count($elFromTable))	{
 			$cells[]='<a href="'.htmlspecialchars($this->clipObj->pasteUrl('_FILE',$fullIdent)).'" onclick="return '.htmlspecialchars($this->clipObj->confirmMsg('_FILE',$fullIdent,'into',$elFromTable)).'" title="' . $GLOBALS['LANG']->getLL('clip_pasteInto', TRUE) . '">'.
-			  t3lib_iconWorks::getSpriteIcon('document-paste-into') . 
+			  t3lib_iconWorks::getSpriteIcon('actions-document-paste-into') . 
 			'</a>';
 		}
 
Index: typo3/wizard_tsconfig.php
===================================================================
--- typo3/wizard_tsconfig.php	(Revision 7809)
+++ typo3/wizard_tsconfig.php	(Arbeitskopie)
@@ -347,7 +347,7 @@
 
 				// Title and description:
 			$out.='<a href="'.htmlspecialchars(t3lib_div::linkThisScript(array('show'=>''))).'" class="typo3-goBack">'.
-					t3lib_iconWorks::getSpriteIcon('actions-go-back') . 
+					t3lib_iconWorks::getSpriteIcon('actions-view-go-back') . 
 					htmlspecialchars($obj_string).
 					'</a><br />';
 			if ($rec['title'])	$out.= '<strong>'.htmlspecialchars($rec['title']).': </strong>';
Index: typo3/alt_doc.php
===================================================================
--- typo3/alt_doc.php	(Revision 7809)
+++ typo3/alt_doc.php	(Arbeitskopie)
@@ -897,7 +897,7 @@
 					// If only SOME fields are shown in the form, this will link the user to the FULL form:
 				if ($this->columnsOnly)	{
 					$buttons['columns_only'] = '<a href="'.htmlspecialchars($this->R_URI.'&columnsOnly=').'" title="' . $LANG->getLL('editWholeRecord', TRUE) . '">' .
-							t3lib_iconWorks::getSpriteIcon('actions-edit-edit') .
+							t3lib_iconWorks::getSpriteIcon('actions-document-open') .
 						'</a>';
 				}
 			}
Index: typo3/class.alt_menu_functions.inc
===================================================================
--- typo3/class.alt_menu_functions.inc	(Revision 7809)
+++ typo3/class.alt_menu_functions.inc	(Arbeitskopie)
@@ -212,7 +212,7 @@
 				// make menu collapsable
 			if($collapsable == 1 && is_array($moduleInfo['sub'])) {
 				$collapseJS = 'onclick="window.location.href=\'alt_menu.php?collapsedOverride['.$moduleName.']='.($config[$moduleName] ? '0' : '1').'\'"';
-				$collapseIcon = t3lib_iconWorks::getSpriteIcon('actions-view-table-' . ($config[$moduleName]) ? 'expand' : 'collapse', array('class' => 'c-iconCollapse'));
+				$collapseIcon = t3lib_iconWorks::getSpriteIcon('actions-view-table-' . ($config[$moduleName] ? 'expand' : 'collapse'), array('class' => 'c-iconCollapse'));
 			} else {
 				$collapseJS = $collapseIcon = '';
 			}
Index: typo3/mod/user/ws/workspaceforms.php
===================================================================
--- typo3/mod/user/ws/workspaceforms.php	(Revision 7809)
+++ typo3/mod/user/ws/workspaceforms.php	(Arbeitskopie)
@@ -179,7 +179,7 @@
 			$this->content .= $LANG->getLL($this->isEditAction ? 'edit_workspace_no_permission' : 'create_workspace_no_permission');
 			$this->content .= $this->doc->spacer(5);
 			$goBack = $GLOBALS['LANG']->getLL('edit_workspace_go_back');
-			$this->content .= t3lib_iconWorks::getSpriteIcon('actions-go-back') .
+			$this->content .= t3lib_iconWorks::getSpriteIcon('actions-view-go-back') .
 						'<a href="javascript:history.back()" title="'. $goBack . '">' .
 						$goBack .
 						'</a>';
Index: typo3/mod/user/ws/class.wslib_gui.php
===================================================================
--- typo3/mod/user/ws/class.wslib_gui.php	(Revision 7809)
+++ typo3/mod/user/ws/class.wslib_gui.php	(Arbeitskopie)
@@ -1184,7 +1184,7 @@
 				if ($table==='pages')	{
 					$actionLinks.=
 						'<a href="#" onclick="top.loadEditId('.$uid.');top.goToModule(\''.$this->pageModule.'\'); return false;" title="' . $LANG->getLL('img_title_edit_page') . '">'.
-						  t3lib_iconWorks::getSpriteIcon('apps-version-page-open') .
+						  t3lib_iconWorks::getSpriteIcon('actions-page-open') .
 						'</a>';
 				} else {
 					$params = '&edit['.$table.']['.$uid.']=edit';
Index: typo3/sysext/tstemplate/ts/index.php
===================================================================
--- typo3/sysext/tstemplate/ts/index.php	(Revision 7809)
+++ typo3/sysext/tstemplate/ts/index.php	(Arbeitskopie)
@@ -307,7 +307,7 @@
 				if(!empty($this->sObj)) {
 						// BACK
 					$buttons['back'] = '<a href="index.php?id=' . $this->id . '" class="typo3-goBack" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.goBack', TRUE) . '">' .
-									t3lib_iconWorks::getSpriteIcon('actions-go-back') . 
+									t3lib_iconWorks::getSpriteIcon('actions-view-go-back') . 
 								'</a>';
 				}
 			}
Index: typo3/sysext/cms/layout/class.tx_cms_layout.php
===================================================================
--- typo3/sysext/cms/layout/class.tx_cms_layout.php	(Revision 7809)
+++ typo3/sysext/cms/layout/class.tx_cms_layout.php	(Arbeitskopie)
@@ -2328,7 +2328,7 @@
 	 * @return	string		IMG tag for icon.
 	 */
 	function noEditIcon($label='noEditItems')	{
-		return t3lib_iconWorks::getSpriteIcon('status-edit-deny', array('title' => $GLOBALS['LANG']->getLL($label, TRUE)));
+		return t3lib_iconWorks::getSpriteIcon('status-edit-read-only', array('title' => $GLOBALS['LANG']->getLL($label, TRUE)));
 	}
 
 	/**
Index: typo3/sysext/version/cm1/index.php
===================================================================
--- typo3/sysext/version/cm1/index.php	(Revision 7809)
+++ typo3/sysext/version/cm1/index.php	(Arbeitskopie)
@@ -809,7 +809,7 @@
 		} else $table = '';
 
 		$linkBack = t3lib_div::_GP('returnUrl') ? '<a href="' . htmlspecialchars(t3lib_div::_GP('returnUrl')) . '" class="typo3-goBack">' .
-				t3lib_iconWorks::getSpriteIcon('actions-go-back') . $GLOBALS['LANG']->getLL('goBack', TRUE) .
+				t3lib_iconWorks::getSpriteIcon('actions-view-go-back') . $GLOBALS['LANG']->getLL('goBack', TRUE) .
 			'</a><br /><br />' : '';
 		$resetDiffOnly = $this->diffOnly ? '<a href="index.php?id=' . intval($this->id) . '" class="typo3-goBack">' . $GLOBALS['LANG']->getLL('showAllInformation') . '</a><br /><br />' : '';
 
Index: typo3/sysext/impexp/class.tx_impexp.php
===================================================================
--- typo3/sysext/impexp/class.tx_impexp.php	(Revision 7809)
+++ typo3/sysext/impexp/class.tx_impexp.php	(Arbeitskopie)
@@ -2707,7 +2707,7 @@
 			$preCode_B = $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;';
 			foreach($record['softrefs'] as $info)	{
 				$pInfo = array();
-				$pInfo['preCode'] = $preCode_A. t3lib_iconWorks::getSpriteIcon('status-reference-soft');
+				$pInfo['preCode'] = $preCode_A. t3lib_iconWorks::getSpriteIcon('apps-impexp-reference-soft');
 				$pInfo['title'] = '<em>'.$info['field'].', "'.$info['spKey'].'" </em>: <span title="'.htmlspecialchars($info['matchString']).'">'.htmlspecialchars(t3lib_div::fixed_lgd_cs($info['matchString'],60)).'</span>';
 				if ($info['subst']['type'])	{
 					if (strlen($info['subst']['title']))	{
@@ -2839,7 +2839,7 @@
 					return;
 				}
 			}
-			$pInfo['preCode'] = $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;'.t3lib_iconWorks::getSpriteIcon('status-reference-file');
+			$pInfo['preCode'] = $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;'.t3lib_iconWorks::getSpriteIcon('apps-impexp-reference-file');
 			$pInfo['title'] = htmlspecialchars($fI['filename']);
 			$pInfo['ref'] = 'FILE';
 			$pInfo['size'] = $fI['filesize'];
@@ -2898,7 +2898,7 @@
 
 				$pInfo['showDiffContent'] = substr($this->fileIDMap[$ID],strlen(PATH_site));
 
-				$pInfo['preCode'] = $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.t3lib_iconWorks::getSpriteIcon('actions-reference-file');
+				$pInfo['preCode'] = $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.t3lib_iconWorks::getSpriteIcon('apps-impexp-reference-file');
 				$pInfo['title'] = htmlspecialchars($fI['filename']).' <em>(Original)</em>';
 				$pInfo['ref'] = 'FILE';
 				$pInfo['size'] = $fI['filesize'];
@@ -2922,7 +2922,7 @@
 
 					$pInfo['showDiffContent'] = substr($this->fileIDMap[$ID],strlen(PATH_site));
 
-					$pInfo['preCode'] = $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.t3lib_iconWorks::getSpriteIcon('actions-reference-file');
+					$pInfo['preCode'] = $preCode.'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'.t3lib_iconWorks::getSpriteIcon('apps-impexp-reference-file');
 					$pInfo['title'] = htmlspecialchars($fI['filename']).' <em>(Resource)</em>';
 					$pInfo['ref'] = 'FILE';
 					$pInfo['size'] = $fI['filesize'];
Index: typo3/class.db_list_extra.inc
===================================================================
--- typo3/class.db_list_extra.inc	(Revision 7809)
+++ typo3/class.db_list_extra.inc	(Arbeitskopie)
@@ -281,7 +281,7 @@
 				// Back
 			if ($this->returnUrl) {
 				$buttons['back'] = '<a href="' . htmlspecialchars(t3lib_div::linkThisUrl($this->returnUrl, array('id' => $this->id))) . '" class="typo3-goBack" title="' . $LANG->sL('LLL:EXT:lang/locallang_core.php:labels.goBack', TRUE) . '">' .
-									t3lib_iconWorks::getSpriteIcon('actions-go-back') .
+									t3lib_iconWorks::getSpriteIcon('actions-view-go-back') .
 								'</a>';
 			}
 		}
@@ -694,7 +694,7 @@
 						// If the record is edit-locked	by another user, we will show a little warning sign:
 					if (($lockInfo = t3lib_BEfunc::isRecordLocked($table, $row['uid']))) {
 						$warning = '<a href="#" onclick="' . htmlspecialchars('alert(' . $GLOBALS['LANG']->JScharCode($lockInfo['msg']) . '); return false;') . '" title="' . htmlspecialchars($lockInfo['msg']) . '">' .
-								t3lib_iconWorks::getSpriteIcon('status-warning-record') .
+								t3lib_iconWorks::getSpriteIcon('status-warning-in-use') .
 							'</a>';
 					}
 					$theData[$fCol] = $warning . $this->linkWrapItems($table, $row['uid'], $recTitle, $row);
@@ -1021,45 +1021,41 @@
 			if ($currentPage > 1) {
 				$labelFirst = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:first');
 
-				$first = '<a href="' . $listURL . '&pointer=0">
-					<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/control_first.gif')
-					. 'alt="' . $labelFirst . '" title="' . $labelFirst . '" />
-				</a>';
+				$first = '<a href="' . $listURL . '&pointer=0">' .
+					t3lib_iconWorks::getSpriteIcon('actions-view-paging-first', array('title'=> $labelFirst)) .
+				'</a>';
 			} else {
-				$first = '<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/control_first_disabled.gif') . 'alt="" title="" />';
+				$first = t3lib_iconWorks::getSpriteIcon('actions-view-paging-first-disabled');
 			}
 
 			if (($currentPage - 1) > 0) {
 				$labelPrevious = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:previous');
 
-				$previous = '<a href="' . $listURL . '&pointer=' . (($currentPage - 2) * $this->iLimit) . '">
-					<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/control_previous.gif')
-					. 'alt="' . $labelPrevious . '" title="' . $labelPrevious . '" />
-					</a>';
+				$previous = '<a href="' . $listURL . '&pointer=' . (($currentPage - 2) * $this->iLimit) . '">' .
+					t3lib_iconWorks::getSpriteIcon('actions-view-paging-previous', array('title' => $labelPrevious)) .
+					'</a>';
 			} else {
-				$previous = '<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/control_previous_disabled.gif') . 'alt="" title="" />';
+				$previous = t3lib_iconWorks::getSpriteIcon('actions-view-paging-previous-disabled');
 			}
 
 			if (($currentPage + 1) <= $totalPages) {
 				$labelNext = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:next');
 
-				$next = '<a href="' . $listURL . '&pointer=' . (($currentPage) * $this->iLimit) . '">
-					<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/control_next.gif')
-					. 'alt="' . $labelNext . '" title="' . $labelNext . '" />
-					</a>';
+				$next = '<a href="' . $listURL . '&pointer=' . (($currentPage) * $this->iLimit) . '">' .
+					t3lib_iconWorks::getSpriteIcon('actions-view-paging-next', array('title' => $labelNext)) .
+					'</a>';
 			} else {
-				$next = '<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/control_next_disabled.gif') . 'alt="" title="" />';
+				$next = t3lib_iconWorks::getSpriteIcon('actions-view-paging-next-disabled');
 			}
 
 			if ($currentPage != $totalPages) {
 				$labelLast = $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_common.xml:last');
 
-				$last = '<a href="' . $listURL . '&pointer=' . (($totalPages - 1) * $this->iLimit) . '">
-					<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/control_last.gif')
-					. 'alt="' . $labelLast . '" title="' . $labelLast . '" />
-					</a>';
+				$last = '<a href="' . $listURL . '&pointer=' . (($totalPages - 1) * $this->iLimit) . '">' .
+					t3lib_iconWorks::getSpriteIcon('actions-view-paging-last', array('title' => $labelLast)) .
+					'</a>';
 			} else {
-				$last = '<img' . t3lib_iconWorks::skinImg($this->backPath, 'gfx/control_last_disabled.gif') . 'alt="" title="" />';
+				$last = t3lib_iconWorks::getSpriteIcon('actions-view-paging-last-disabled');
 			}
 
 			$reload = '<a href="#" onclick="document.dblistForm.action=\''