Index: classes/class.tx_templavoila_icons.php
new file mode 100644
===================================================================
---  classes/class.tx_templavoila_icons.php (revision 35991)
+++  classes/class.tx_templavoila_icons.php (working copy)
@@ -0,0 +1,128 @@
+<?php
+/***************************************************************
+* Copyright notice
+*
+* (c)  2010 Tolleiv Nietsch <nietsch@aoemedia.de>
+*  All rights reserved
+*
+*  This script is part of the Typo3 project. The Typo3 project is
+*  free software; you can redistribute it and/or modify
+*  it under the terms of the GNU General Public License as published by
+*  the Free Software Foundation; either version 2 of the License, or
+*  (at your option) any later version.
+*
+*  The GNU General Public License can be found at
+*  http://www.gnu.org/copyleft/gpl.html.
+*
+*  This script is distributed in the hope that it will be useful,
+*  but WITHOUT ANY WARRANTY; without even the implied warranty of
+*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+*  GNU General Public License for more details.
+*
+*  This copyright notice MUST APPEAR in all copies of the script!
+***************************************************************/
+
+/**
+ * Class which adds an additional layer for icon creation
+ *
+ */
+final class tx_templavoila_icons {
+
+	static $oldIcons = array(
+		'actions-view-go-back'	=> 		array('file' => 'gfx/goback.gif', 'attributes' => 'width="14" height="14"'),
+		'actions-document-new' => 		array('file' =>  'gfx/new_el.gif'),
+		'actions-insert-record' => 		array('file' => 'gfx/insert3.gif'),
+		'actions-edit-hide'=> 			array('file' => 'gfx/button_hide.gif'),
+		'actions-edit-unhide'=> 		array('file' => 'gfx/button_unhide.gif'),
+		'actions-document-view' => 		array('file' => 'gfx/zoom.gif', 'attributes' => 'width="12" height="12"'),
+		'actions-system-list-open' => 	array('file' => 'gfx/list.gif', 'attributes' => 'width="11" height="11"'),
+		'actions-document-history-open' => array('file' => 'gfx/history2.gif', 'attributes' => 'width="13" height="12"'),
+		'actions-page-move' => 			array('file' => 'gfx/move_page.gif', 'attributes' => 'width="11" height="12"'),
+		'actions-page-new' => 			array('file' => 'gfx/new_page.gif', 'attributes' => 'width="13" height="12"'),
+		'actions-document-open' => 		array('file' => 'gfx/edit2.gif', 'attributes' => 'width="11" height="12"'),
+		'actions-edit-delete' =>		array('file' => 'gfx/deletedok.gif'),
+		'actions-edit-copy' => 			array('file' => 'gfx/clip_copy.gif'),
+		'actions-edit-copy-release' => 	array('file' => 'gfx/clip_copy_h.gif'),
+		'actions-edit-cut' => 			array('file' => 'gfx/clip_cut.gif'),
+		'actions-edit-cut-release' => 	array('file' => 'gfx/clip_cut_h.gif'),
+		'actions-system-list-open' => 	array('file' => 'mod/web/list/list.gif'),
+		'apps-pagetree-page-shortcut' => array('file' => 'gfx/shortcut.gif'),
+		'actions-move-up' => 			array('file' => 'gfx/pilup.gif'),
+		'actions-move-down' =>			array('file' => 'gfx/pildown.gif'),
+		'actions-view-table-expand' => 	array('file' => 'gfx/plusbullet_list.gif'),
+		'actions-view-table-collapse' => array('file' => 'gfx/minusbullet_list.gif'),
+	);
+
+	static $useOldIcons = null;
+	static $reInit = true;
+
+	public static function init() {
+
+		if(self::$useOldIcons !== null && self::$reInit == false) {
+			return;
+		}
+
+		if(version_compare(TYPO3_version,'4.4','<') || self::$useOldIcons) {
+			self::$useOldIcons = true;
+			if (is_array($GLOBALS['TBE_STYLES']['spritemanager']['singleIcons'])) {
+				foreach($GLOBALS['TBE_STYLES']['spritemanager']['singleIcons'] as $name => $file) {
+					if (!isset(self::$oldIcons[$name])) {
+						self::$oldIcons[$name] = array('file' => $file);
+					}
+				}
+			}
+		} else {
+			self::$useOldIcons = false;
+		}
+		self::$reInit = true;
+	}
+
+	/**
+	 *
+	 * @param string $iconName
+	 * @param array $options
+	 * @param array $overlays
+	 * @return string
+	 */
+	public static function getIcon($iconName, $options = array(), $overlays = array()) {
+
+		self::init();
+
+		if (self::$useOldIcons) {
+			$alt = isset($options['alt']) ? ' alt="' . $options['alt'] .'"': ' alt=""';
+			$title = isset($options['title']) ? ' alt="' . $options['title'] .'"': '';
+			$wHattribs = isset(self::$oldIcons[$iconName]['attributes']) ? self::$oldIcons[$iconName]['attributes'] : '';
+			return '<img' . t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'],self::$oldIcons[$iconName]['file'], $wHattribs) . $alt . $title . '  style="text-align:center; vertical-align: middle; border:0;" />';
+		} else {
+			return t3lib_iconWorks::getSpriteIcon($iconName, $options, $overlays);
+		}
+	}
+
+	/**
+	 *
+	 * @param string $table
+	 * @param array $row
+	 * @param array $options
+	 * @return string
+	 */
+	public static function getIconForRecord($table, $row, $options = array()) {
+
+		if (self::$useOldIcons === null) {
+			self::init();
+		}
+		if (self::$useOldIcons) {
+
+			if($table == 'pages') {
+				$title = htmlspecialchars(t3lib_div::fixed_lgd_cs(t3lib_BEfunc::getRecordTitle('pages', $row), 50));
+			} else {
+				$title = '[' . $table . ':'.$row['uid'];
+			}
+
+			return '<img'.t3lib_iconWorks::skinImg($GLOBALS['BACK_PATH'], t3lib_iconWorks::getIcon($tabke, $row),'').' border="0" title="' . $title . '" alt="" />';
+		} else {
+			return t3lib_iconWorks::getSpriteIconForRecord($table, $row, $options);
+		}
+	}
+
+}
+?>
\ No newline at end of file
Index: cm1/index.php
===================================================================
---  cm1/index.php (revision 35991)
+++  cm1/index.php (working copy)
@@ -524,12 +524,7 @@ class tx_templavoila_cm1 extends t3lib_SCbase {
 
 			// Back
 		if ($this->returnUrl) {
-			if(version_compare(TYPO3_version,'4.4','>')) {
-				$backIcon = t3lib_iconWorks::getSpriteIcon('actions-view-go-back');
-			} else {
-				$backIcon = '<img' . t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/goback.gif','width="14" height="14"') . ' alt="" />';
-			}
-
+			$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: cm2/index.php
===================================================================
---  cm2/index.php (revision 35991)
+++  cm2/index.php (working copy)
@@ -248,12 +248,7 @@ class tx_templavoila_cm2 extends t3lib_SCbase {
 
 			// Back
 		if ($this->returnUrl) {
-			if(version_compare(TYPO3_version,'4.4','>')) {
-				$backIcon = t3lib_iconWorks::getSpriteIcon('actions-view-go-back');
-			} else {
-				$backIcon = '<img' . t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/goback.gif','width="14" height="14"') . ' alt="" />';
-			}
-
+			$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: ext_autoload.php
===================================================================
---  ext_autoload.php (revision 35991)
+++  ext_autoload.php (working copy)
@@ -20,6 +20,7 @@ return array(
 	'tx_templavoila_datastructure_dbbase' => $extensionPath . 'classes/class.tx_templavoila_datastructure_dbbase.php',
 	'tx_templavoila_datastructure_staticbase' => $extensionPath . 'classes/class.tx_templavoila_datastructure_staticbase.php',
 	'tx_templavoila_div' => $extensionPath . 'classes/class.tx_templavoila_div.php',
+	'tx_templavoila_icons' => $extensionPath . 'classes/class.tx_templavoila_icons.php',
 	'tx_templavoila_label' => $extensionPath . 'classes/class.tx_templavoila_label.php',
 	'tx_templavoila_template' => $extensionPath . 'classes/class.tx_templavoila_template.php',
 	'tx_templavoila_templaterepository' => $extensionPath . 'classes/class.tx_templavoila_templateRepository.php',
Index: ext_localconf.php
===================================================================
---  ext_localconf.php (revision 35991)
+++  ext_localconf.php (working copy)
@@ -243,6 +243,7 @@ if(t3lib_div::int_from_ver(TYPO3_version) < 4003000) {
 	$list = include(t3lib_extMgm::extPath('templavoila') . '/ext_autoload.php');
 	require_once $list['tx_templavoila_api'];
 	require_once $list['tx_templavoila_div'];
+	require_once $list['tx_templavoila_icons'];
 	require_once $list['tx_templavoila_datastructure'];
 	require_once $list['tx_templavoila_datastructure_dbbase'];
 	require_once $list['tx_templavoila_datastructure_staticbase'];
@@ -250,4 +251,4 @@ if(t3lib_div::int_from_ver(TYPO3_version) < 4003000) {
 	require_once $list['tx_templavoila_template'];
 	require_once $list['tx_templavoila_templaterepository'];
 }
-?>
+?>
\ No newline at end of file
Index: ext_tables.php
===================================================================
---  ext_tables.php (revision 35991)
+++  ext_tables.php (working copy)
@@ -192,7 +192,7 @@ if ($_EXTCONF['enable.']['selectDataStructure']) {
 	$TCA['tt_content']['ctrl']['requestUpdate'] .= 'tx_templavoila_ds';
 }
 
-$TCA['tt_content']['types'][$_EXTKEY . '_pi1']['showitem'] = 
+$TCA['tt_content']['types'][$_EXTKEY . '_pi1']['showitem'] =
 	'CType;;4;;1-1-1, hidden, header;;' . (($_EXTCONF['enable.']['renderFCEHeader']) ? '3' : '' ) . ';;2-2-2, linkToTop;;;;3-3-3,
 	 --div--;LLL:EXT:templavoila/locallang_db.xml:tt_content.CType_pi1,' . (($_EXTCONF['enable.']['selectDataStructure']) ? 'tx_templavoila_ds,' : '') . 'tx_templavoila_to,tx_templavoila_flex;;;;2-2-2,
 	 --div--;LLL:EXT:cms/locallang_tca.xml:pages.tabs.access, starttime, endtime, fe_group';
@@ -303,5 +303,30 @@ if (TYPO3_MODE=='BE')	{
 	);
 	t3lib_extMgm::addLLrefForTCAdescr('_MOD_web_func','EXT:wizard_crpages/locallang_csh.xml');
 }
-
+if (TYPO3_MODE=='BE') {
+	if(version_compare(TYPO3_version,'4.4','>')) {
+		$icons = array(
+			'paste' => t3lib_extMgm::extRelPath('templavoila') . 'mod1/clip_pasteafter.gif',
+			'pasteSubRef' => t3lib_extMgm::extRelPath('templavoila') . 'mod1/clip_pastesubref.gif',
+			'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'
+		);
+		t3lib_SpriteManager::addSingleIcons($icons, $_EXTKEY);
+	} else {
+		$icons = array(
+			'extensions-templavoila-paste' => t3lib_extMgm::extRelPath('templavoila') . 'mod1/clip_pasteafter.gif',
+			'extensions-templavoila-pasteSubRef' => t3lib_extMgm::extRelPath('templavoila') . 'mod1/clip_pastesubref.gif',
+			'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'
+		);
+		$GLOBALS['TBE_STYLES']['spritemanager']['singleIcons'] = array_merge(
+			(array) $GLOBALS['TBE_STYLES']['spritemanager']['singleIcons'],
+			$icons
+		);
+	}
+}
 ?>
\ No newline at end of file
Index: mod1/class.tx_templavoila_mod1_clipboard.php
===================================================================
---  mod1/class.tx_templavoila_mod1_clipboard.php (revision 35991)
+++  mod1/class.tx_templavoila_mod1_clipboard.php (working copy)
@@ -151,9 +151,9 @@ class tx_templavoila_mod1_clipboard {
 
 		}
 
-		$copyIcon = '<img'.t3lib_iconWorks::skinImg($this->pObj->doc->backPath,'gfx/clip_copy'.($clipActive_copy ? '_h':'').'.gif','').' title="'.$LANG->getLL ('copyrecord').'" border="0" alt="" />';
-		$cutIcon = '<img'.t3lib_iconWorks::skinImg($this->pObj->doc->backPath,'gfx/clip_cut'.($clipActive_cut ? '_h':'').'.gif','').' title="'.$LANG->getLL ('cutrecord').'" border="0" alt="" />';
-		$refIcon = '<img'.t3lib_iconWorks::skinImg($this->pObj->doc->backPath,t3lib_extMgm::extRelPath('templavoila').'mod1/clip_ref'.($clipActive_ref ? '_h':'').'.gif','').' title="'.$LANG->getLL ('createreference').'" vspace="2" hspace="2" alt="" />';
+		$copyIcon = tx_templavoila_icons::getIcon('actions-edit-copy'. ($clipActive_copy ? '-release':''), array('title' => $LANG->getLL ('copyrecord')));
+		$cutIcon = tx_templavoila_icons::getIcon('actions-edit-cut'. ($clipActive_cut ? '-release':''), array('title' => $LANG->getLL ('cutrecord')));
+		$refIcon = tx_templavoila_icons::getIcon('extensions-templavoila-clip_ref'. ($clipActive_ref ? '-release':''), array('title' => $LANG->getLL ('createreference')));
 
 		$removeElement = '&amp;CB[removeAll]=normal';
 		$setElement = '&amp;CB[el]['.rawurlencode('tt_content|'.$elementRecord['uid']).']='.rawurlencode($this->pObj->apiObj->flexform_getStringFromPointer($elementPointer));
@@ -223,8 +223,8 @@ class tx_templavoila_mod1_clipboard {
 
 			// Prepare the ingredients for the different buttons:
 		$pasteMode = isset ($this->t3libClipboardObj->clipData['normal']['flexMode']) ? $this->t3libClipboardObj->clipData['normal']['flexMode'] : ($this->t3libClipboardObj->clipData['normal']['mode'] == 'copy' ? 'copy' : 'cut');
-		$pasteAfterIcon = '<img'.t3lib_iconWorks::skinImg($this->pObj->doc->backPath,'gfx/clip_pasteafter.gif','').' title="'.$LANG->getLL ('pasterecord').'" alt="" />';
-		$pasteSubRefIcon = '<img'.t3lib_iconWorks::skinImg('clip_pastesubref.gif','').' title="'.$LANG->getLL ('pastefce_andreferencesubs').'" alt="" />';
+		$pasteAfterIcon = tx_templavoila_icons::getIcon('extensions-templavoila-paste', array('title' => $LANG->getLL ('pasterecord')));
+		$pasteSubRefIcon = tx_templavoila_icons::getIcon('extensions-templavoila-pasteSubRef', array('title' => $LANG->getLL ('pastefce_andreferencesubs')));
 
 		$sourcePointerString = $this->pObj->apiObj->flexform_getStringFromPointer ($clipboardElementPointer);
 		$destinationPointerString = $this->pObj->apiObj->flexform_getStringFromPointer ($destinationPointer);
@@ -280,7 +280,7 @@ class tx_templavoila_mod1_clipboard {
 
 				// Prepare buttons:
 			$cutButton = $this->element_getSelectButtons($elementPointerString, 'ref');
-			$recordIcon = '<img'.t3lib_iconWorks::skinImg($this->doc->backPath, t3lib_iconWorks::getIcon('tt_content', $row),'').' border="0" title="[tt_content:'.$row['uid'].'" alt="" />';
+			$recordIcon = tx_templavoila_icons::getIconForRecord('tt_content', $row);
 			$recordButton = $this->pObj->doc->wrapClickMenuOnIcon($recordIcon, 'tt_content', $row['uid'], 1, '&callingScriptId='.rawurlencode($this->pObj->doc->scriptID), 'new,copy,cut,pasteinto,pasteafter,delete');
 
 
@@ -311,7 +311,7 @@ class tx_templavoila_mod1_clipboard {
 				}
 				$label = $LANG->getLL('rendernonusedelements_deleteall');
 				$deleteAll = '<a href="#" onclick="'.htmlspecialchars('jumpToUrl(\''.$this->doc->issueCommand($params,-1).'\');').'">'.
-						'<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/garbage.gif','width="11" height="12"').' title="'.htmlspecialchars($label).'" alt="" />'.
+						tx_templavoila_icons::getIcon('actions-edit-delete', array('title' => htmlspecialchars($label))).
 						htmlspecialchars($label).
 						'</a>';
 			}
@@ -366,7 +366,7 @@ class tx_templavoila_mod1_clipboard {
 			$this->deleteUids[] = $uid;
 			$params = '&cmd[tt_content]['.$uid.'][delete]=1';
 			return '<a class="tpm-countRef" href="#" onclick="'.htmlspecialchars('jumpToUrl(\''.$this->doc->issueCommand($params,-1).'\');').'">'.
-					'<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/garbage.gif','width="11" height="12"').' title="'.$LANG->getLL('renderreferencecount_delete',1).'" alt="" />'.
+					tx_templavoila_icons::getIcon('actions-edit-delete', array('title' => $LANG->getLL('renderreferencecount_delete',1))).
 					'</a>';
 		} else {
 			return '';
Index: mod1/class.tx_templavoila_mod1_recordlist.php
===================================================================
---  mod1/class.tx_templavoila_mod1_recordlist.php (revision 35991)
+++  mod1/class.tx_templavoila_mod1_recordlist.php (working copy)
@@ -89,13 +89,13 @@ class tx_templavoila_mod1_recordlist extends localRecordList {
 			case 'fwd':
 				$href = $this->returnUrl . '&SET[recordsView_start]='.($pointer-$this->iLimit).'&SET[recordsView_table]='.$table;
 				$content = '<a href="'.htmlspecialchars($href).'">'.
-						'<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/pilup.gif','width="14" height="14"').' alt="" />'.
+						tx_templavoila_icons::getIcon('actions-move-up').
 						'</a> <i>[1 - '.$pointer.']</i>';
 			break;
 			case 'rwd':
 				$href = $this->returnUrl . '&SET[recordsView_start]='.$pointer.'&SET[recordsView_table]='.$table;
 				$content = '<a href="'.htmlspecialchars($href).'">'.
-						'<img'.t3lib_iconWorks::skinImg($this->backPath,'gfx/pildown.gif','width="14" height="14"').' alt="" />'.
+						tx_templavoila_icons::getIcon('actions-move-down').
 						'</a> <i>['.($pointer+1).' - '.$this->totalItems.']</i>';
 			break;
 		}
Index: mod1/class.tx_templavoila_mod1_sidebar.php
===================================================================
---  mod1/class.tx_templavoila_mod1_sidebar.php (revision 35991)
+++  mod1/class.tx_templavoila_mod1_sidebar.php (working copy)
@@ -182,15 +182,17 @@ class tx_templavoila_mod1_sidebar {
 				// Create the whole sidebar:
 			switch ($this->position) {
 				case 'left':
+					$minusIcon = tx_templavoila_icons::getIcon('actions-view-table-collapse');
+					$plusIcon = tx_templavoila_icons::getIcon('actions-view-table-expand');
 					$sideBar = '
 						<!-- TemplaVoila Sidebar (left) begin -->
 
 						<div id="tx_templavoila_mod1_sidebar-bar" style="height: 100%; width: '.$this->sideBarWidth.'px; margin: 0 4px 0 0; display:none;" class="bgColor-10">
-							<div style="text-align:right;"><a href="#" onClick="tx_templavoila_mod1_sidebar_toggle();"><img '.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/minusbullet_list.gif','').' title="" alt="" /></a></div>
+							<div style="text-align:right;"><a href="#" onClick="tx_templavoila_mod1_sidebar_toggle();">' . $minusIcon . '</a></div>
 							'.$this->doc->getDynTabMenu($numSortedSideBarItems, 'TEMPLAVOILA:pagemodule:sidebar', 1, true).'
 						</div>
 						<div id="tx_templavoila_mod1_sidebar-showbutton" style="height: 100%; width: 18px; margin: 0 4px 0 0; display:block; " class="bgColor-10">
-							<a href="#" onClick="tx_templavoila_mod1_sidebar_toggle();"><img '.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/plusbullet_list.gif','').' title="" alt="" /></a>
+							<a href="#" onClick="tx_templavoila_mod1_sidebar_toggle();">' . $plusIcon . '</a>
 						</div>
 
 						<script type="text/javascript">
Index: mod1/class.tx_templavoila_mod1_specialdoktypes.php
===================================================================
---  mod1/class.tx_templavoila_mod1_specialdoktypes.php (revision 35991)
+++  mod1/class.tx_templavoila_mod1_specialdoktypes.php (working copy)
@@ -89,9 +89,9 @@ class tx_templavoila_mod1_specialdoktypes {
 		global $LANG, $BE_USER, $TYPO3_CONF_VARS;
 
 			// Prepare the record icon including a content sensitive menu link wrapped around it:
-		$pageTitle = htmlspecialchars(t3lib_div::fixed_lgd_cs(t3lib_BEfunc::getRecordTitle('pages', $pageRecord), 50));
-		$recordIcon = $recordIcon = '<img'.t3lib_iconWorks::skinImg($this->doc->backPath, t3lib_iconWorks::getIcon('pages', $pageRecord), '').' style="text-align: center; vertical-align: middle;" width="18" height="16" border="0" title="'.$pageTitle.'" alt="" />';
-		$editButton = $this->pObj->link_edit('<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/edit2.gif','').' title="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage')).'" alt="" style="text-align: center; vertical-align: middle; border:0;" />', 'pages', $pageRecord['uid']);
+		$recordIcon = tx_templavoila_icons::getIconForRecord('pages', $pageRecord);
+		$iconEdit = tx_templavoila_icons::getIcon('actions-document-open', array('title' => htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage'))));
+		$editButton = $this->pObj->link_edit($iconEdit, 'pages', $pageRecord['uid']);
 
 		switch ($pageRecord['urltype']) {
 			case 2:
@@ -153,15 +153,15 @@ class tx_templavoila_mod1_specialdoktypes {
 		global $LANG, $BE_USER, $TYPO3_CONF_VARS;
 
 			// Prepare the record icon including a content sensitive menu link wrapped around it:
-		$pageTitle = htmlspecialchars(t3lib_div::fixed_lgd_cs(t3lib_BEfunc::getRecordTitle('pages', $pageRecord), 50));
-		$recordIcon = '<img'.t3lib_iconWorks::skinImg($this->doc->backPath, t3lib_iconWorks::getIcon('pages', $pageRecord), '').' style="text-align: center; vertical-align: middle;" width="18" height="16" border="0" title="'.$pageTitle.'" alt="" />';
+		$recordIcon = tx_templavoila_icons::getIconForRecord('pages', $pageRecord);
 		$recordButton = $this->doc->wrapClickMenuOnIcon($recordIcon, 'pages', $pageRecord['uid'], 1, '&callingScriptId='.rawurlencode($this->doc->scriptID), 'new,copy,cut,pasteinto,pasteafter,delete');
-		$editButton = $this->pObj->link_edit('<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/edit2.gif','').' title="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage')).'" alt="" style="text-align: center; vertical-align: middle; border:0;" />', 'pages', $pageRecord['uid']);
+		$iconEdit = tx_templavoila_icons::getIcon('actions-document-open', array('title' => htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage'))));
+		$editButton = $this->pObj->link_edit($iconEdit, 'pages', $pageRecord['uid']);
 
 		if (intval($pageRecord['shortcut_mode']) == 0) {
 			$shortcutSourcePageRecord = t3lib_beFunc::getRecordWSOL('pages', $pageRecord['shortcut']);
 			$jumpToShortcutSourceLink = '<strong><a href="index.php?id='.$pageRecord['shortcut'].'">'.
-										'<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/shortcut.gif',''). ' style="border:none; vertical-align: middle" /> '.
+										tx_templavoila_icons::getIcon('apps-pagetree-page-shortcut').
 										$LANG->getLL ('jumptoshortcutdestination', '',1).'</a></strong>';
 		}
 
@@ -197,13 +197,13 @@ class tx_templavoila_mod1_specialdoktypes {
 		if (!$pageRecord['mount_pid_ol']) return FALSE;
 
 			// Put together the records icon including content sensitive menu link wrapped around it:
-		$recordIcon = '<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/i/pages_mountpoint.gif','').' style="text-align: center; vertical-align: middle;" width="18" height="16" border="0" title="'.htmlspecialchars('[pages]').'" alt="" />';
+		$recordIcon = tx_templavoila_icons::getIconForRecord('pages', $pageRecord);
 		$recordIcon = $this->doc->wrapClickMenuOnIcon($recordIcon, 'pages', $this->id, 1, '&amp;callingScriptId='.rawurlencode($this->doc->scriptID));
-
-		$editButton = $this->pObj->link_edit('<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/edit2.gif','').' title="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage')).'" alt="" style="text-align: center; vertical-align: middle; border:0;" />', 'pages', $pageRecord['uid']);
+		$iconEdit = tx_templavoila_icons::getIcon('actions-document-open', array('title' => htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage'))));
+		$editButton = $this->pObj->link_edit($iconEdit, 'pages', $pageRecord['uid']);
 
 		$mountSourcePageRecord = t3lib_beFunc::getRecordWSOL('pages', $pageRecord['mount_pid']);
-		$mountSourceIcon = '<img'.t3lib_iconWorks::skinImg($this->doc->backPath, t3lib_iconWorks::getIcon('pages', $mountSourcePageRecord), '').' style="text-align: center; vertical-align: middle;" width="18" height="16" border="0" title="'.$mountSourcePageRecord['title'].'" alt="" />';
+		$mountSourceIcon = tx_templavoila_icons::getIconForRecord('pages', $mountSourcePageRecord);
 		$mountSourceButton = $this->doc->wrapClickMenuOnIcon($mountSourceIcon, 'pages', $mountSourcePageRecord['uid'], 1, '&callingScriptId='.rawurlencode($this->doc->scriptID), 'new,copy,cut,pasteinto,pasteafter,delete');
 
 		$mountSourceLink = '<br /><br />
@@ -240,16 +240,16 @@ class tx_templavoila_mod1_specialdoktypes {
 
 			// Prepare the record icon including a content sensitive menu link wrapped around it:
 		$pageTitle = htmlspecialchars(t3lib_div::fixed_lgd_cs(t3lib_BEfunc::getRecordTitle('pages', $pageRecord), 50));
-		$recordIcon = '<img'.t3lib_iconWorks::skinImg($this->doc->backPath, t3lib_iconWorks::getIcon('pages', $pageRecord), '').' style="text-align: center; vertical-align: middle;" width="18" height="16" border="0" title="'.$pageTitle.'" alt="" />';
-
-		$editButton = $this->pObj->link_edit('<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/edit2.gif','').' title="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage')).'" alt="" style="text-align: center; vertical-align: middle; border:0;" />', 'pages', $pageRecord['uid']);
+		$recordIcon = tx_templavoila_icons::getIconForRecord('pages', $pageRecord);
+		$iconEdit = tx_templavoila_icons::getIcon('actions-document-open', array('title' => htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage'))));
+		$editButton = $this->pObj->link_edit($iconEdit, 'pages', $pageRecord['uid']);
 
 		if ($this->userHasAccessToListModule()) {
 			$listModuleURL = t3lib_div::getIndpEnv('TYPO3_SITE_URL') . TYPO3_mainDir . 'db_list.php?id='.intval($this->pObj->id);
 			$onClick = "top.nextLoadModuleUrl='".$listModuleURL."';top.fsMod.recentIds['web']=".intval($this->pObj->id).";top.goToModule('web_list',1);";
-			$listModuleLink = '<br /><br />
-				<img'.t3lib_iconWorks::skinImg($this->doc->backPath, 'mod/web/list/list.gif', '').' style="text-align:center; vertical-align: middle; border:0;" />
-				<strong><a href="#" onClick="'.$onClick.'">'.$LANG->getLL('editpage_sysfolder_switchtolistview','',1).'</a></strong>
+			$listModuleLink = '<br /><br />'.
+			 	tx_templavoila_icons::getIcon('actions-system-list-open').
+				'<strong><a href="#" onClick="'.$onClick.'">'.$LANG->getLL('editpage_sysfolder_switchtolistview','',1).'</a></strong>
 			';
 		} else {
 			$listModuleLink = $LANG->getLL('editpage_sysfolder_listview_noaccess','',1);
Index: mod1/clip_pasteafter.gif
new file mode 100644
===================================================================
Binary files /dev/null and mod1/clip_pasteafter.gif differ
Index: mod1/clip_ref.gif
===================================================================
Binary files mod1/clip_ref.gif and mod1/clip_ref.gif differ
Index: mod1/clip_ref_h.gif
===================================================================
Binary files mod1/clip_ref_h.gif and mod1/clip_ref_h.gif differ
Index: mod1/db_new_content_el.php
===================================================================
---  mod1/db_new_content_el.php (revision 35991)
+++  mod1/db_new_content_el.php (working copy)
@@ -320,12 +320,7 @@ class tx_templavoila_dbnewcontentel {
 
 			// Back
 		if ($this->returnUrl) {
-			if(version_compare(TYPO3_version,'4.4','>')) {
-				$backIcon = t3lib_iconWorks::getSpriteIcon('actions-view-go-back');
-			} else {
-				$backIcon = '<img' . t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/goback.gif','width="14" height="14"') . ' alt="" />';
-			}
-
+			$backIcon = tx_templavoila_icons('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 35991)
+++  mod1/index.php (working copy)
@@ -579,7 +579,8 @@ class tx_templavoila_module1 extends t3lib_SCbase {
 						$this->content .= $result;
 						if ($GLOBALS['BE_USER']->isPSet($this->calcPerms, 'pages', 'edit')) {
 							// Edit icon only if page can be modified by user
-							$this->content .= '<br/><br/><strong>'.$this->link_edit('<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/edit2.gif','').' title="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage')).'" alt="" /> '.$LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage'),'pages',$this->id).'</strong>';
+							$iconEdit = tx_templavoila_icons::getIcon('actions-document-open', array('title' => $LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage')));
+							$this->content .= '<br/><br/><strong>'.$this->link_edit($iconEdit . $LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage'), 'pages', $this->id) . '</strong>';
 						}
 						$render_editPageScreen = false; // Do not output editing code for special doctypes!
 					}
@@ -776,7 +777,7 @@ class tx_templavoila_module1 extends t3lib_SCbase {
 			// View page
 		$viewAddGetVars = $this->currentLanguageUid ? '&L=' . $this->currentLanguageUid : '';
 		$buttons['view'] = '<a href="#" onclick="' . htmlspecialchars(t3lib_BEfunc::viewOnClick($this->id, $BACK_PATH, t3lib_BEfunc::BEgetRootLine($this->id), '', '', $viewAddGetVars)) . '">' .
-				'<img' . t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/zoom.gif', 'width="12" height="12"') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showPage', 1) . '" hspace="3" alt="" />' .
+				tx_templavoila_icons::getIcon('actions-document-view', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showPage', 1))).
 				'</a>';
 
 			// Shortcut
@@ -788,7 +789,7 @@ class tx_templavoila_module1 extends t3lib_SCbase {
 		if ($BE_USER->check('modules','web_list'))	{
 			$href = $BACK_PATH . 'db_list.php?id=' . $this->id . '&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'));
 			$buttons['record_list'] = '<a href="' . htmlspecialchars($href) . '">' .
-					'<img' . t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/list.gif', 'width="11" height="11"') . ' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showList', 1) . '" alt="" />' .
+					tx_templavoila_icons::getIcon('actions-system-list-open', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.php:labels.showList', 1))).
 					'</a>';
 		}
 
@@ -796,21 +797,21 @@ class tx_templavoila_module1 extends t3lib_SCbase {
 
 				// Page history
 			$buttons['history_page'] = '<a href="#" onclick="' . htmlspecialchars('jumpToUrl(\'' . $BACK_PATH . 'show_rechis.php?element=' . rawurlencode('pages:' . $this->id) . '&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI')) . '#latest\');return false;') . '">' .
-						'<img' . t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/history2.gif', 'width="13" height="12"') . ' vspace="2" hspace="2" align="top" title="' . $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xml:recordHistory', 1) . '" alt="" />' .
+						tx_templavoila_icons::getIcon('actions-document-history-open', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xml:recordHistory', 1))).
 						'</a>';
 				// Move page
 			$buttons['move_page'] = '<a href="' . htmlspecialchars($BACK_PATH . 'move_el.php?table=pages&uid=' . $this->id . '&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI'))) . '">' .
-						'<img' . t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/move_page.gif', 'width="11" height="12"') . ' vspace="2" hspace="2" align="top" title="' . $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xml:move_page', 1) . '" alt="" />' .
+						tx_templavoila_icons::getIcon('actions-page-move', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xml:move_page', 1))).
 						'</a>';
 				// Create new page (wizard)
 			$buttons['new_page'] = '<a href="#" onclick="' . htmlspecialchars('jumpToUrl(\'' . $BACK_PATH . 'db_new.php?id=' . $this->id . '&pagesOnly=1&returnUrl=' . rawurlencode(t3lib_div::getIndpEnv('REQUEST_URI') . '&updatePageTree=true') . '\');return false;') . '">' .
-						'<img' . t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/new_page.gif', 'width="13" height="12"') . ' hspace="0" vspace="2" align="top" title="' . $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xml:newPage', 1) . '" alt="" />' .
+						tx_templavoila_icons::getIcon('actions-page-new', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xml:newPage', 1))).
 						'</a>';
 				// Edit page properties
 			if (!$this->translatorMode && $GLOBALS['BE_USER']->isPSet($this->calcPerms, 'pages', 'edit'))	{
 				$params='&edit[pages][' . $this->id . ']=edit';
 				$buttons['edit_page'] = '<a href="#" onclick="' . htmlspecialchars(t3lib_BEfunc::editOnClick($params, $BACK_PATH)) . '">' .
-							'<img' . t3lib_iconWorks::skinImg($BACK_PATH, 'gfx/edit2.gif', 'width="11" height="12"') . ' hspace="2" vspace="2" align="top" title="' . $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xml:editPageProperties', 1) . '" alt="" />' .
+							tx_templavoila_icons::getIcon('actions-document-open', array('title' => $GLOBALS['LANG']->sL('LLL:EXT:cms/layout/locallang.xml:editPageProperties', 1))).
 							'</a>';
 			}
 
@@ -865,7 +866,9 @@ class tx_templavoila_module1 extends t3lib_SCbase {
 
 			// Create a back button if neccessary:
 		if (is_array ($this->altRoot)) {
-			$output .= '<div style="text-align:right; width:100%; margin-bottom:5px;"><a href="index.php?id='.$this->id.'"><img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/goback.gif','').' title="'.htmlspecialchars($LANG->getLL ('goback')).'" alt="" /></a></div>';
+			$output .= '<div style="text-align:right; width:100%; margin-bottom:5px;"><a href="index.php?id='.$this->id.'">'.
+						tx_templavoila_icons::getIcon('actions-view-go-back', array('title' => htmlspecialchars($LANG->getLL ('goback')))).
+						'</a></div>';
 		}
 
 			// Hook for content at the very top (fx. a toolbar):
@@ -1024,13 +1027,15 @@ class tx_templavoila_module1 extends t3lib_SCbase {
 				if (!$this->translatorMode) {
 
 					if ($canEditContent) {
-						$linkMakeLocal = !$elementBelongsToCurrentPage && !in_array('makeLocal', $this->blindIcons) ? $this->link_makeLocal('<img'.t3lib_iconWorks::skinImg($this->doc->backPath,t3lib_extMgm::extRelPath('templavoila') . 'mod1/makelocalcopy.gif','').' title="'.$LANG->getLL('makeLocal').'" alt="" vspace="2" hspace="2" />', $parentPointer) : '';
+						$iconMakeLocal = tx_templavoila_icons::getIcon('extensions-templavoila-makelocalcopy', array('title' => $LANG->getLL('makeLocal')));
+						$linkMakeLocal = !$elementBelongsToCurrentPage && !in_array('makeLocal', $this->blindIcons) ? $this->link_makeLocal($iconMakeLocal, $parentPointer) : '';
 						$linkCut = $this->clipboardObj->element_getSelectButtons($parentPointer, 'cut');
 						if(	$this->modTSconfig['properties']['enableDeleteIconForLocalElements'] < 2 ||
 							!$elementBelongsToCurrentPage ||
 							$this->global_tt_content_elementRegister[$contentTreeArr['el']['uid']] > 1
 						) {
-							$linkUnlink = !in_array('unlink', $this->blindIcons) ? $this->link_unlink('<img'.t3lib_iconWorks::skinImg($this->doc->backPath, t3lib_extMgm::extRelPath('templavoila') . 'mod1/unlink.png','').' title="'.$LANG->getLL('unlinkRecord').'" border="0" alt="" />', $parentPointer, FALSE, FALSE, $elementPointer) : '';
+							$iconUnlink = tx_templavoila_icons::getIcon('extensions-templavoila-unlink', array('title' => $LANG->getLL('unlinkRecord')));
+							$linkUnlink = !in_array('unlink', $this->blindIcons) ? $this->link_unlink($iconUnlink, $parentPointer, FALSE, FALSE, $elementPointer) : '';
 						} else {
 							$linkUnlink = '';
 						}
@@ -1039,12 +1044,18 @@ class tx_templavoila_module1 extends t3lib_SCbase {
 					}
 
 					if ($canEditElement && $GLOBALS['BE_USER']->recordEditAccessInternals('tt_content', $contentTreeArr['previewData']['fullRow'])) {
-						$linkEdit = (($elementBelongsToCurrentPage || (!$elementBelongsToCurrentPage && $this->modTSconfig['properties']['enableEditIconForRefElements'])) && !in_array('edit', $this->blindIcons) ? $this->link_edit('<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/edit2.gif','').' title="'.$LANG->getLL('editrecord').'" border="0" alt="" />',$contentTreeArr['el']['table'],$contentTreeArr['el']['uid'], false,$contentTreeArr['el']['pid']) : '');
+						if (($elementBelongsToCurrentPage || $this->modTSconfig['properties']['enableEditIconForRefElements']) && !in_array('edit', $this->blindIcons)) {
+							$iconEdit = tx_templavoila_icons::getIcon('actions-document-open', array('title' => $LANG->getLL('editrecord')));
+							$linkEdit = $this->link_edit($iconEdit, $contentTreeArr['el']['table'],$contentTreeArr['el']['uid'], false,$contentTreeArr['el']['pid']);
+						} else {
+							$linkEdit = '';
+						}
 						$linkHide = !in_array('hide', $this->blindIcons) ? $this->icon_hide($contentTreeArr['el']) : '';
 
 						if( $canEditContent && $this->modTSconfig['properties']['enableDeleteIconForLocalElements'] && $elementBelongsToCurrentPage ) {
 							$hasForeignReferences = $this->hasElementForeignReferences($contentTreeArr['el'],$contentTreeArr['el']['pid']);
-							$linkDelete = !in_array('delete', $this->blindIcons) ? $this->link_unlink('<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/deletedok.gif','').' title="'.$LANG->getLL('deleteRecord').'" border="0" alt="" />', $parentPointer, TRUE, $hasForeignReferences, $elementPointer) : '';
+							$iconDelete = tx_templavoila_icons::getIcon('actions-edit-delete', array('title' => $LANG->getLL('deleteRecord')));
+							$linkDelete = !in_array('delete', $this->blindIcons) ? $this->link_unlink($iconDelete, $parentPointer, TRUE, $hasForeignReferences, $elementPointer) : '';
 						} else {
 							$linkDelete = '';
 						}
@@ -1595,7 +1606,7 @@ class tx_templavoila_module1 extends t3lib_SCbase {
 								}
 
 								$linkLabel = $LANG->getLL('createcopyfortranslation',1).' ('.htmlspecialchars($sLInfo['title']).')';
-								$localizeIcon = '<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/clip_copy.gif','width="12" height="12"').' class="bottom" title="'.$linkLabel.'" alt="" />';
+								$localizeIcon = tx_templavoila_icons::getIcon('actions-edit-copy', array('title'=>$linkLabel));
 
 								$l10nInfo = '<a class="tpm-clipCopyTranslation" href="#" onclick="'.htmlspecialchars($onClick).'">'.$localizeIcon.'</a>';
 								$l10nInfo .= ' <em><a href="#" onclick="'.htmlspecialchars($onClick).'">'.$linkLabel.'</a></em>';
@@ -1784,12 +1795,13 @@ class tx_templavoila_module1 extends t3lib_SCbase {
 			// Prepare table specific settings:
 		switch ($contentTreeArr['el']['table']) {
 			case 'pages' :
-				$titleBarLeftButtons .= $this->translatorMode ? '' : $this->link_edit('<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/edit2.gif','').' title="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage')).'" alt="" />',$contentTreeArr['el']['table'],$contentTreeArr['el']['uid']);
+				$iconEdit = tx_templavoila_icons::getIcon('actions-document-open', array('title' => $LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:editPage')));
+				$titleBarLeftButtons .= $this->translatorMode ? '' : $this->link_edit($iconEdit,$contentTreeArr['el']['table'],$contentTreeArr['el']['uid']);
 				$titleBarRightButtons = '';
 
 				$addGetVars = ($this->currentLanguageUid?'&L='.$this->currentLanguageUid:'');
 				$viewPageOnClick = 'onclick= "'.htmlspecialchars(t3lib_BEfunc::viewOnClick($contentTreeArr['el']['uid'], $this->doc->backPath, t3lib_BEfunc::BEgetRootLine($contentTreeArr['el']['uid']),'','',$addGetVars)).'"';
-				$viewPageIcon = '<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/zoom.gif','width="12" height="12"').' title="'.$LANG->sL('LLL:EXT:lang/locallang_core.xml:labels.showPage',1).'" hspace="3" alt="" />';
+				$viewPageIcon = tx_templavoila_icons::getIcon('actions-document-view', array('title' => $LANG->sL('LLL:EXT:lang/locallang_core.xml:labels.showPage',1)));
 				$titleBarLeftButtons .= '<a href="#" '.$viewPageOnClick.'>'.$viewPageIcon.'</a>';
 			break;
 			case 'tt_content' :
@@ -1800,23 +1812,26 @@ class tx_templavoila_module1 extends t3lib_SCbase {
 					$titleBarRightButtons = '';
 				} else {
 						// Create CE specific buttons:
-					$linkMakeLocal = !$elementBelongsToCurrentPage ? $this->link_makeLocal('<img' . t3lib_iconWorks::skinImg($this->doc->backPath,t3lib_extMgm::extRelPath('templavoila') . 'mod1/makelocalcopy.gif','').' title="'.$LANG->getLL('makeLocal').'" vspace="2" hspace="2" alt="" />', $parentPointer) : '';
+					$iconMakeLocal = tx_templavoila_icons::getIcon('extensions-templavoila-makelocalcopy', array('title' => $LANG->getLL('makeLocal')));
+					$linkMakeLocal = !$elementBelongsToCurrentPage ? $this->link_makeLocal($iconMakeLocal, $parentPointer) : '';
 					if(	$this->modTSconfig['properties']['enableDeleteIconForLocalElements'] < 2 ||
 						!$elementBelongsToCurrentPage ||
 						$this->global_tt_content_elementRegister[$contentTreeArr['el']['uid']] > 1
 					) {
-						$linkUnlink = $this->link_unlink('<img'.t3lib_iconWorks::skinImg($this->doc->backPath, t3lib_extMgm::extRelPath('templavoila') . 'mod1/unlink.png','').' title="'.$LANG->getLL('unlinkRecord').'" border="0" alt="" />', $parentPointer, FALSE);
+						$iconUnlink = tx_templavoila_icons::getIcon('extensions-templavoila-unlink', array('title' => $LANG->getLL('unlinkRecord')));
+						$linkUnlink = $this->link_unlink($iconUnlink, $parentPointer, FALSE);
 					} else {
 						$linkUnlink ='';
 					}
 					if( $this->modTSconfig['properties']['enableDeleteIconForLocalElements'] && $elementBelongsToCurrentPage ) {
 						$hasForeignReferences = $this->hasElementForeignReferences($contentTreeArr['el'],$contentTreeArr['el']['pid']);
-						$linkDelete = $this->link_unlink('<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/deletedok.gif','').' title="'.$LANG->getLL('deleteRecord').'" border="0" alt="" />', $parentPointer, TRUE, $hasForeignReferences);
+						$iconDelete = tx_templavoila_icons::getIcon('actions-edit-delete', array('title' => $LANG->getLL('deleteRecord')));
+						$linkDelete = $this->link_unlink($iconDelete, $parentPointer, TRUE, $hasForeignReferences);
 					} else {
 						$linkDelete = '';
 					}
-
-					$linkEdit = ($elementBelongsToCurrentPage ? $this->link_edit('<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/edit2.gif','').' title="'.$LANG->getLL ('editrecord').'" border="0" alt="" />',$contentTreeArr['el']['table'],$contentTreeArr['el']['uid']) : '');
+					$iconEdit = tx_templavoila_icons::getIcon('actions-document-open', array('title' => $LANG->getLL('editrecord')));
+					$linkEdit = ($elementBelongsToCurrentPage ? $this->link_edit($iconEdit,$contentTreeArr['el']['table'],$contentTreeArr['el']['uid']) : '');
 
 					$titleBarRightButtons = $linkEdit . $this->clipboardObj->element_getSelectButtons ($parentPointer) . $linkMakeLocal . $linkUnlink . $linkDelete;
 				}
@@ -1921,7 +1936,7 @@ class tx_templavoila_module1 extends t3lib_SCbase {
 
 							if (!$this->translatorMode)	{
 									// "New" and "Paste" icon:
-								$newIcon = '<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/new_el.gif','').' title="'.$LANG->getLL ('createnewrecord').'" alt="" />';
+								$newIcon = tx_templavoila_icons::getIcon('actions-document-new', array('title' => $LANG->getLL ('createnewrecord')));
 								$controls = $this->link_new($newIcon, $subElementPointer);
 								$controls .= $this->clipboardObj->element_getPasteButtons($subElementPointer);
 							}
@@ -1948,7 +1963,7 @@ class tx_templavoila_module1 extends t3lib_SCbase {
 
 										if (!$this->translatorMode)	{
 												// "New" and "Paste" icon:
-											$newIcon = '<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/new_el.gif','').' title="'.$LANG->getLL ('createnewrecord').'" alt="" />';
+											$newIcon = tx_templavoila_icons::getIcon('actions-document-new', array('title' => $LANG->getLL ('createnewrecord')));
 											$controls = $this->link_new($newIcon, $subElementPointer);
 											$controls .= $this->clipboardObj->element_getPasteButtons ($subElementPointer);
 										}
@@ -2089,12 +2104,15 @@ class tx_templavoila_module1 extends t3lib_SCbase {
 	function icon_hide($el) {
 		global $LANG;
 
-		$hideIcon = ($el['table'] == 'pages'
-		?	'<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/button_hide.gif','').' border="0" title="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:hidePage')).'" alt="" />'
-		:	'<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/button_hide.gif','').' border="0" title="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:hide')).'" alt="" />');
-		$unhideIcon = ($el['table'] == 'pages'
-		?	'<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/button_unhide.gif','').' border="0" title="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:unHidePage')).'" alt="" />'
-		:	'<img'.t3lib_iconWorks::skinImg($this->doc->backPath,'gfx/button_unhide.gif','').' border="0" title="'.htmlspecialchars($LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:unHide')).'" alt="" />');
+		$iconOptions = array(
+			'title' => ($el['table'] == 'pages' ? $LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:hidePage') : $LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:hide'))
+		);
+		$hideIcon = tx_templavoila_icons::getIcon('actions-edit-hide', $iconOptions);
+
+		$iconOptions = array(
+			'title' => ($el['table'] == 'pages' ? $LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:unHidePage') : $LANG->sL('LLL:EXT:lang/locallang_mod_web_list.xml:unHide'))
+		);
+		$unhideIcon = tx_templavoila_icons::getIcon('actions-edit-unhide', $iconOptions);
 
 		if ($el['isHidden'])
 			$label = $unhideIcon;
@@ -2255,15 +2273,20 @@ class tx_templavoila_module1 extends t3lib_SCbase {
 
 			// "New" icon:
 		if ($canCreateNew && !in_array('new', $this->blindIcons)) {
-			$newIcon =	'<img' . t3lib_iconWorks::skinImg($this->doc->backPath, 'gfx/new_el.gif', '') .
-				' title="' . $GLOBALS['LANG']->getLL ('createnewrecord') . '" alt="" />';
+			$iconOptions = array(
+				'title' => $GLOBALS['LANG']->getLL ('createnewrecord')
+			);
+			$newIcon = tx_templavoila_icons::getIcon('actions-document-new', $iconOptions);
 			$output .= $this->link_new($newIcon, $elementPointer);
 		}
 
 			// "Browse Record" icon
 		if ($canEditContent && !in_array('browse', $this->blindIcons)) {
-			$newIcon = '<img class="browse"' . t3lib_iconWorks::skinImg($this->doc->backPath, 'gfx/insert3.gif', '') .
-				' title="' . $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.browse_db') . '" alt="" />';
+			$iconOptions = array(
+				'title' => $GLOBALS['LANG']->sL('LLL:EXT:lang/locallang_core.xml:labels.browse_db'),
+				'class'	=> 'browse'
+			);
+			$newIcon = tx_templavoila_icons::getIcon('actions-insert-record', $iconOptions);
 			$output .= $this->link_browse($newIcon, $elementPointer);
 		}
 
Index: mod1/makelocalcopy.gif
===================================================================
Binary files mod1/makelocalcopy.gif and mod1/makelocalcopy.gif differ
Index: mod1/pagemodule_4.4.css
===================================================================
---  mod1/pagemodule_4.4.css (revision 35991)
+++  mod1/pagemodule_4.4.css (working copy)
@@ -170,10 +170,6 @@ div.warning a {
 	padding-right:4px;
 }
 
-.t3-row-header .tpm-element-control a {
-	padding:1px;
-}
-
 /* prevent flicker effects with row-headers and their hide/visibility states */
 .t3-page-ce {
 	margin-bottom:0;
Index: mod1/pagemodule_4.5.css
===================================================================
---  mod1/pagemodule_4.5.css (revision 35991)
+++  mod1/pagemodule_4.5.css (working copy)
@@ -170,10 +170,6 @@ div.warning a {
 	padding-right:4px;
 }
 
-.t3-row-header .tpm-element-control a {
-	padding:1px;
-}
-
 /* prevent flicker effects with row-headers and their hide/visibility states */
 .t3-page-ce {
 	margin-bottom:0;