Index: class.tx_templavoila_cm1.php
===================================================================
---  class.tx_templavoila_cm1.php (revision 36040)
+++  class.tx_templavoila_cm1.php (working copy)
@@ -177,7 +177,7 @@ class tx_templavoila_cm1 {
 				if ($res) {
 					while (false != ($referenceRecord = $TYPO3_DB->sql_fetch_assoc ($res))) {
 						$pageRecord = t3lib_beFunc::getRecord('pages', $referenceRecord['pid']);
-						$icon = t3lib_iconWorks::getIconImage('pages', $pageRecord, $backRef->backPath);
+						$icon = tx_templavoila_icons::getIconForRecord('pages', $pageRecord);
 	// To do: Display language flag icon and jump to correct language
 #						if ($referenceRecord['lkey'] != 'lDEF') {
 #							$icon .= ' lKey:'.$referenceRecord['lkey'];
Index: classes/class.tx_templavoila_icons.php
===================================================================
---  classes/class.tx_templavoila_icons.php (revision 36040)
+++  classes/class.tx_templavoila_icons.php (working copy)
@@ -117,11 +117,7 @@ final class tx_templavoila_icons {
 		}
 		if (self::$useOldIcons) {
 
-			if($table == 'pages') {
-				$title = htmlspecialchars(t3lib_div::fixed_lgd_cs(t3lib_BEfunc::getRecordTitle('pages', $row), 50));
-			} else {
-				$title = '[' . $table . ':'.$row['uid'];
-			}
+			$title = htmlspecialchars(t3lib_div::fixed_lgd_cs(t3lib_BEfunc::getRecordIconAltText('pages', $row), 50));
 
 			return '<img'.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], t3lib_iconWorks::getIcon($table, $row),'').' border="0" title="' . $title . '" alt="" />';
 		} else {
Index: cm1/index.php
===================================================================
---  cm1/index.php (revision 36040)
+++  cm1/index.php (working copy)
@@ -927,7 +927,7 @@ class tx_templavoila_cm1 extends t3lib_SCbase {
  				<tr>
 					<td class="bgColor4">
 						<a href="#" onclick ="openValidator( ' . $GLOBALS['LANG']->JScharCode(file_get_contents($this->displayFile)) . ');return false;">
-							<img ' . t3lib_iconWorks::skinImg($this->doc->backPath, t3lib_extMgm::extRelPath('templavoila') . 'resources/icons/html_go.png') . ' align="top" />
+						' . tx_templavoila_icons::getIcon('extensions-templavoila-htmlvalidate') . '
 							' . $GLOBALS['LANG']->getLL('validateTpl') . '
 						</a>
 					</td>
@@ -1181,7 +1181,7 @@ class tx_templavoila_cm1 extends t3lib_SCbase {
 			if (is_array($row))	{
 
 					// Get title and icon:
-				$icon = t3lib_iconworks::getIconImage('tx_templavoila_datastructure',$row,$GLOBALS['BACK_PATH'],' align="top" title="' . $GLOBALS['LANG']->getLL('renderDSO_uid') . ': '.$this->displayUid.'"');
+				$icon = tx_templavoila_icons::getIconForRecord('tx_templavoila_datastructure', $row);
 				$title = t3lib_BEfunc::getRecordTitle('tx_templavoila_datastructure',$row,1);
 				$content.=$this->doc->wrapClickMenuOnIcon($icon,'tx_templavoila_datastructure',$row['uid'],1).
 						'<strong>'.$title.'</strong><br />';
@@ -1237,7 +1237,7 @@ class tx_templavoila_cm1 extends t3lib_SCbase {
 								<td><strong>' . $GLOBALS['LANG']->getLL('renderDSO_fileRef') . ':</strong></td>
 								<td><strong>' . $GLOBALS['LANG']->getLL('renderDSO_dataLgd') . ':</strong></td>
 							</tr>';
-				$TOicon = t3lib_iconworks::getIconImage('tx_templavoila_tmplobj',array(),$GLOBALS['BACK_PATH'],' align="top"');
+				$TOicon = tx_templavoila_icons::getIconForRecord('tx_templavoila_tmplobj',array());
 
 					// Listing Template Objects with links:
 				while(false !== ($TO_Row = $TYPO3_DB->sql_fetch_assoc($res)))	{
@@ -1323,7 +1323,8 @@ class tx_templavoila_cm1 extends t3lib_SCbase {
 					</tr>';
 
 					// Get title and icon:
-				$icon = t3lib_iconworks::getIconImage('tx_templavoila_tmplobj',$row,$GLOBALS['BACK_PATH'],' align="top" title="UID: '.$this->displayUid.'"');
+				$icon = tx_templavoila_icons::getIconForRecord('tx_templavoila_tmplobj', $row);
+
 				$title = t3lib_BEfunc::getRecordTitle('tx_templavoila_tmplobj', $row);
 				$title = t3lib_BEFunc::getRecordTitlePrep($GLOBALS['LANG']->sL($title));
 				$tRows[]='
@@ -1345,7 +1346,7 @@ class tx_templavoila_cm1 extends t3lib_SCbase {
 						<tr class="bgColor4">
 							<td>
 								<a href="#" onclick ="openValidator( ' . $GLOBALS['LANG']->JScharCode(file_get_contents($theFile)) . ');return false;">
-									<img ' . t3lib_iconWorks::skinImg($this->doc->backPath, t3lib_extMgm::extRelPath('templavoila') . 'resources/icons/html_go.png') . ' align="top" />
+									' . tx_templavoila_icons::getIcon('extensions-templavoila-htmlvalidate') . '
 									' . $GLOBALS['LANG']->getLL('validateTpl') . '
 								</a>
 							</td>
@@ -1369,7 +1370,7 @@ class tx_templavoila_cm1 extends t3lib_SCbase {
 							// Get main DS array:
 						if (is_array($DS_row))	{
 								// Get title and icon:
-							$icon = t3lib_iconworks::getIconImage('tx_templavoila_datastructure',$DS_row,$GLOBALS['BACK_PATH'],' align="top" title="UID: '.$DS_row['uid'].'"');
+							$icon = tx_templavoila_icons::getIconForRecord('tx_templavoila_datastructure',$DS_row);
 							$title = t3lib_BEfunc::getRecordTitle('tx_templavoila_datastructure', $DS_row);
 							$title = t3lib_BEFunc::getRecordTitlePrep($GLOBALS['LANG']->sL($title));
 
Index: ext_tables.php
===================================================================
---  ext_tables.php (revision 36040)
+++  ext_tables.php (working copy)
@@ -311,7 +311,8 @@ if (TYPO3_MODE=='BE') {
 			'makelocalcopy' => t3lib_extMgm::extRelPath('templavoila') . 'mod1/makelocalcopy.gif',
 			'clip_ref' => t3lib_extMgm::extRelPath('templavoila') . 'mod1/clip_ref.gif',
 			'clip_ref-release' => t3lib_extMgm::extRelPath('templavoila') . 'mod1/clip_ref_h.gif',
-			'unlink' => t3lib_extMgm::extRelPath('templavoila') . 'mod1/unlink.png'
+			'unlink' => t3lib_extMgm::extRelPath('templavoila') . 'mod1/unlink.png',
+			'htmlvalidate' => t3lib_extMgm::extRelPath('templavoila') . 'resources/icons/html_go.png'
 		);
 		t3lib_SpriteManager::addSingleIcons($icons, $_EXTKEY);
 	} else {
@@ -321,7 +322,8 @@ if (TYPO3_MODE=='BE') {
 			'extensions-templavoila-makelocalcopy' => t3lib_extMgm::extRelPath('templavoila') . 'mod1/makelocalcopy.gif',
 			'extensions-templavoila-clip_ref' => t3lib_extMgm::extRelPath('templavoila') . 'mod1/clip_ref.gif',
 			'extensions-templavoila-clip_ref-release' => t3lib_extMgm::extRelPath('templavoila') . 'mod1/clip_ref_h.gif',
-			'extensions-templavoila-unlink' => t3lib_extMgm::extRelPath('templavoila') . 'mod1/unlink.png'
+			'extensions-templavoila-unlink' => t3lib_extMgm::extRelPath('templavoila') . 'mod1/unlink.png',
+			'extensions-templavoila-htmlvalidate' => t3lib_extMgm::extRelPath('templavoila') . 'resources/icons/html_go.png'
 		);
 		$GLOBALS['TBE_STYLES']['spritemanager']['singleIcons'] = array_merge(
 			(array) $GLOBALS['TBE_STYLES']['spritemanager']['singleIcons'],
Index: func_wizards/class.tx_templavoila_referenceelementswizard.php
===================================================================
---  func_wizards/class.tx_templavoila_referenceelementswizard.php (revision 36040)
+++  func_wizards/class.tx_templavoila_referenceelementswizard.php (working copy)
@@ -93,7 +93,7 @@ class tx_templavoila_referenceElementsWizard extends t3lib_extobjbase {
 		$tree->init('AND '.$GLOBALS['BE_USER']->getPagePermsClause(1));
 
 			// Creating top icon; the current page
-		$HTML = t3lib_iconWorks::getIconImage('pages', $treeStartingRecord, $GLOBALS['BACK_PATH'],'align="top"');
+		$HTML = tx_templavoila_icons::getIconForRecord('pages', $treeStartingRecord);
 		$tree->tree[] = array(
 			'row' => $treeStartingRecord,
 			'HTML' => $HTML
Index: mod1/db_new_content_el.php
===================================================================
---  mod1/db_new_content_el.php (revision 36040)
+++  mod1/db_new_content_el.php (working copy)
@@ -182,7 +182,7 @@ class tx_templavoila_dbnewcontentel {
 			$this->content.=$this->doc->spacer(5);
 
 			$elRow = t3lib_BEfunc::getRecordWSOL('pages',$this->id);
-			$header= t3lib_iconWorks::getIconImage('pages',$elRow,$BACK_PATH,' title="'.htmlspecialchars(t3lib_BEfunc::getRecordIconAltText($elRow,'pages')).'" align="top"');
+			$header= tx_templavoila_icons::getIconForRecord('pages', $elRow);
 			$header.= t3lib_BEfunc::getRecordTitle('pages',$elRow,1);
 			$this->content.=$this->doc->section('',$header,0,1);
 			$this->content.=$this->doc->spacer(10);
@@ -320,7 +320,7 @@ class tx_templavoila_dbnewcontentel {
 
 			// Back
 		if ($this->returnUrl) {
-			$backIcon = tx_templavoila_icons('actions-view-go-back');
+			$backIcon = tx_templavoila_icons::getIcon('actions-view-go-back');
 			$buttons['back'] = '<a href="' . htmlspecialchars(t3lib_div::linkThisUrl($this->returnUrl)) . '" class="typo3-goBack" title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.goBack', TRUE) . '">' .
 								$backIcon .
 							   '</a>';
Index: mod1/index.php
===================================================================
---  mod1/index.php (revision 36040)
+++  mod1/index.php (working copy)
@@ -1562,7 +1562,7 @@ class tx_templavoila_module1 extends t3lib_SCbase {
 							);
 
 								// Put together the records icon including content sensitive menu link wrapped around it:
-							$recordIcon_l10n = t3lib_iconWorks::getIconImage('tt_content',$localizedRecordInfo['row'],$this->doc->backPath,'class="absmiddle" title="'.htmlspecialchars('[tt_content:'.$localizedRecordInfo['uid'].']').'"');
+							$recordIcon_l10n = tx_templavoila_icons::getIconForRecord('tt_content', $localizedRecordInfo['row']);
 							if (!$this->translatorMode)	{
 								$recordIcon_l10n = $this->doc->wrapClickMenuOnIcon($recordIcon_l10n,'tt_content',$localizedRecordInfo['uid'],1,'&amp;callingScriptId='.rawurlencode($this->doc->scriptID), 'new,copy,cut,pasteinto,pasteafter');
 							}
@@ -2014,7 +2014,7 @@ class tx_templavoila_module1 extends t3lib_SCbase {
 
 								// Put together the records icon including content sensitive menu link wrapped around it:
 							$recordIcon_l10n = $this->getRecordStatHookValue('tt_content', $olrow['uid']).
-								t3lib_iconWorks::getIconImage('tt_content',$olrow,$this->doc->backPath,'class="absmiddle" title="'.htmlspecialchars('[tt_content:'.$olrow['uid'].']').'"');
+								tx_templavoila_icons::getIconForRecord('tt_content', $olrow);
 							if (!$this->translatorMode)	{
 								$recordIcon_l10n = $this->doc->wrapClickMenuOnIcon($recordIcon_l10n,'tt_content',$olrow['uid'],1,'&amp;callingScriptId='.rawurlencode($this->doc->scriptID), 'new,copy,cut,pasteinto,pasteafter');
 							}
Index: mod2/index.php
===================================================================
---  mod2/index.php (revision 36040)
+++  mod2/index.php (working copy)
@@ -347,7 +347,7 @@ class tx_templavoila_module2 extends t3lib_SCbase {
 					$tRows[] = '
 						<tr class="bgColor4">
 							<td><a href="index.php?id=' . $pid . '" onclick="setHighlight(' . $pid . ')">' .
-							t3lib_iconWorks::getIconImage('pages', t3lib_BEfunc::getRecord('pages', $pid), $this->doc->backPath, 'class="absmiddle" title="'. htmlspecialchars($alttext) . '"') .
+							tx_templavoila_icons::getIconForRecord('pages', t3lib_BEfunc::getRecord('pages', $pid)).
 							htmlspecialchars($path).'</a></td>
 							<td>' . $dsRepo->getDatastructureCountForPid($pid) . '</td>
 							<td>' . $toRepo->getTemplateCountForPid($pid) . '</td>
@@ -430,11 +430,11 @@ class tx_templavoila_module2 extends t3lib_SCbase {
 			switch((string)$scopePointer)	{
 				case '1':
 					$label = $LANG->getLL('pagetemplates');
-					$scopeIcon = t3lib_iconWorks::getIconImage('pages',array(),$this->doc->backPath,'class="absmiddle"');
+					$scopeIcon = tx_templavoila_icons::getIconForRecord('pages', array());
 				break;
 				case '2':
 					$label = $LANG->getLL('fces');
-					$scopeIcon = t3lib_iconWorks::getIconImage('tt_content',array(),$this->doc->backPath,'class="absmiddle"');
+					$scopeIcon = tx_templavoila_icons::getIconForRecord('tt_content', array());
 				break;
 				case '0':
 					$label = $LANG->getLL('other');
@@ -633,7 +633,7 @@ class tx_templavoila_module2 extends t3lib_SCbase {
 		if (!$dsR['_STATIC'])	{
 				// Record icon:
 				// Put together the records icon including content sensitive menu link wrapped around it:
-			$recordIcon = t3lib_iconWorks::getIconImage('tx_templavoila_datastructure',$dsR,$this->doc->backPath,'class="absmiddle"');
+			$recordIcon = tx_templavoila_icons::getIconForRecord('tx_templavoila_datastructure' ,$dsR);
 			$recordIcon = $this->doc->wrapClickMenuOnIcon($recordIcon, 'tx_templavoila_datastructure', $dsR['uid'], 1, '&callingScriptId='.rawurlencode($this->doc->scriptID));
 
 				// Preview icon:
@@ -807,7 +807,7 @@ class tx_templavoila_module2 extends t3lib_SCbase {
 	function renderTODisplay($toObj, &$toRecords, $scope, $children=0)	{
 
 			// Put together the records icon including content sensitive menu link wrapped around it:
-		$recordIcon = t3lib_iconWorks::getIconImage('tx_templavoila_tmplobj',$toObj,$this->doc->backPath,'class="absmiddle"');
+		$recordIcon = tx_templavoila_icons::getIconForRecord('tx_templavoila_tmplobj', $toObj);
 		$recordIcon = $this->doc->wrapClickMenuOnIcon($recordIcon, 'tx_templavoila_tmplobj', $toObj['uid'], 1, '&callingScriptId='.rawurlencode($this->doc->scriptID));
 
 			// Preview icon: