Index: branches/RC/core/admin_templates/js/catalog.js
===================================================================
diff -u -r11538 -r11541
--- branches/RC/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 11538)
+++ branches/RC/core/admin_templates/js/catalog.js	(.../catalog.js)	(revision 11541)
@@ -236,14 +236,16 @@
 	if (this.ActivePrefix != $prefix) {
 		// hide source tab
 		this.PreviousPrefix = this.ActivePrefix;
-		document.getElementById(this.PreviousPrefix + '_tab').className = 'catalog-tab-unselected';
+		$( jq('#' + this.PreviousPrefix + '_tab') ).removeClass('tab-active');
+
 		document.getElementById(this.queryTabRegistry('prefix', this.PreviousPrefix, 'tab_id') + '_div').style.display = 'none';
 		this.HideDependentButtons(this.PreviousPrefix);
 	}
 
 	// show destination tab
 	this.ActivePrefix = $prefix;
-	document.getElementById(this.ActivePrefix + '_tab').className = 'catalog-tab-selected';
+	$( jq('#' + this.ActivePrefix + '_tab') ).addClass('tab-active');
+
 	var $div_id = this.queryTabRegistry('prefix', this.ActivePrefix, 'tab_id') + '_div'; // destination tab
 	document.getElementById($div_id).style.display = 'block';
 	this.ShowDependentButtons(this.ActivePrefix);
Index: branches/RC/core/admin_templates/catalog/catalog_tabs.tpl
===================================================================
diff -u -r11368 -r11541
--- branches/RC/core/admin_templates/catalog/catalog_tabs.tpl	(.../catalog_tabs.tpl)	(revision 11368)
+++ branches/RC/core/admin_templates/catalog/catalog_tabs.tpl	(.../catalog_tabs.tpl)	(revision 11541)
@@ -1,33 +1,17 @@
 <inp2:m_DefaultParam special="" skip_prefixes=""/>
-<table cellpadding="0" cellspacing="0" border="0" width="100%">
-	<tr>
-		<td align="right" width="100%">
-	  		<table cellpadding="0" cellspacing="0" border="0" height="23">
-				<tr>
-					<inp2:m_DefineElement name="item_tab" title="" special="">
-						<td nowrap="nowrap" width="140">
-							<table id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_tab" cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected" onclick="$Catalog.switchTab('<inp2:m_param name="prefix"/><inp2:m_param name="special"/>');">
-								<tr>
-									<td style="background-color: #FFFFFF;">
-										<img src="img/spacer.gif" height="1" width="5" />
-									</td>
-									<td class="catalog-tab-left">
-										<img src="img/spacer.gif" height="22" width="9" />
-									</td>
-									<td class="catalog-tab-middle" width="100%" align="left" valign="middle" nowrap="nowrap">
-										<img src="<inp2:m_TemplatesBase module='$icon_module'/>/img/itemicons/<inp2:m_Param name='icon'/>" width="16" height="16" align="absmiddle" alt=""/>
-										<inp2:m_phrase name="$title"/> <span class="cats_stats">(<span id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_item_count">?</span>)</span>
-									</td>
-					       			<td class="catalog-tab-right">
-					     				<img src="img/spacer.gif" height="22" width="9" />
-									</td>
-								</tr>
-							</table>
-						</td>
-					</inp2:m_DefineElement>
-					<inp2:adm_ListCatalogTabs render_as="item_tab" title_property="ViewMenuPhrase" skip_prefixes="$skip_prefixes" special="$special" replace_m="yes"/>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
\ No newline at end of file
+
+<inp2:m_DefineElement name="item_tab" title="" special="">
+	<td class="tab-spacer"><img src="img/spacer.gif" width="3" height="1"/></td>
+	<td id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_tab" class="tab">
+		<img src="<inp2:m_TemplatesBase module='$icon_module'/>/img/itemicons/<inp2:m_Param name='icon'/>" width="16" height="16" align="absmiddle" alt=""/>
+		<a href="#" onclick="$Catalog.switchTab('<inp2:m_param name="prefix"/><inp2:m_param name="special"/>'); return false;" class="tab-link">
+			<inp2:m_phrase name="$title"/> <span class="cats_stats" style="color: inherit;">(<span id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_item_count">?</span>)</span>
+		</a>
+	</td>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="catalog_tabs">
+	<inp2:adm_ListCatalogTabs render_as="item_tab" title_property="ViewMenuPhrase" skip_prefixes="$skip_prefixes" special="$special" replace_m="yes"/>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="tabs_container" tabs_render_as="catalog_tabs" special="$special" skip_prefixes="$skip_prefixes"/>
\ No newline at end of file
Index: branches/RC/core/admin_templates/catalog/item_selector/item_selector_tabs.tpl
===================================================================
diff -u -r11525 -r11541
--- branches/RC/core/admin_templates/catalog/item_selector/item_selector_tabs.tpl	(.../item_selector_tabs.tpl)	(revision 11525)
+++ branches/RC/core/admin_templates/catalog/item_selector/item_selector_tabs.tpl	(.../item_selector_tabs.tpl)	(revision 11541)
@@ -1,42 +1,24 @@
 <inp2:m_DefaultParam special="" skip_prefixes=""/>
-<table cellpadding="0" cellspacing="0" border="0" width="100%">
-	<tr>
-		<td align="right" width="100%">
-	  		<table cellpadding="0" cellspacing="0" border="0" height="23">
-				<tr>
-					<inp2:m_DefineElement name="item_tab" title="" special="">
-						<td nowrap="nowrap" width="140">
-							<table id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_tab" cellpadding="0" cellspacing="0" width="100%" class="catalog-tab-unselected" onclick="$Catalog.switchTab('<inp2:m_param name="prefix"/><inp2:m_param name="special"/>');">
-								<tr>
-									<td style="background-color: #FFFFFF;">
-										<img src="img/spacer.gif" height="1" width="5" />
-									</td>
-									<td class="catalog-tab-left">
-										<img src="img/spacer.gif" height="22" width="9" />
-									</td>
-									<td class="catalog-tab-middle" width="100%" align="left" valign="middle" nowrap="nowrap">
-										<img src="<inp2:m_TemplatesBase module='$icon_module'/>/img/itemicons/<inp2:m_Param name='icon'/>" width="16" height="16" align="absmiddle" alt=""/>
-										<inp2:m_phrase name="$title"/> <span class="cats_stats">(<span id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_item_count">?</span>)</span>
-									</td>
-					       			<td class="catalog-tab-right">
-					     				<img src="img/spacer.gif" height="22" width="9" />
-									</td>
-								</tr>
-							</table>
-						</td>
-					</inp2:m_DefineElement>
+<inp2:m_DefineElement name="item_tab" title="" special="">
+	<td class="tab-spacer"><img src="img/spacer.gif" width="3" height="1"/></td>
+	<td id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_tab" class="tab">
+		<img src="<inp2:m_TemplatesBase module='$icon_module'/>/img/itemicons/<inp2:m_Param name='icon'/>" width="16" height="16" align="absmiddle" alt=""/>
+		<a href="#" onclick="$Catalog.switchTab('<inp2:m_param name="prefix"/><inp2:m_param name="special"/>'); return false;" class="tab-link">
+			<inp2:m_phrase name="$title"/> <span class="cats_stats" style="color: inherit;">(<span id="<inp2:m_param name="prefix"/><inp2:m_param name="special"/>_item_count">?</span>)</span>
+		</a>
+	</td>
+</inp2:m_DefineElement>
 
-					<inp2:m_DefineElement name="tab_headers">
-						<inp2:adm_ListCatalogTabs render_as="item_tab" title_property="ViewMenuPhrase" skip_prefixes="$skip_prefixes" special="$special" replace_m="yes"/>
-					</inp2:m_DefineElement>
+<inp2:m_DefineElement name="tab_headers">
+	<inp2:adm_ListCatalogTabs render_as="item_tab" title_property="ViewMenuPhrase" skip_prefixes="$skip_prefixes" special="$special" replace_m="yes"/>
+</inp2:m_DefineElement>
 
-					<inp2:m_if check="m_Get" name="t" equals_to="catalog/item_selector/item_selector_catalog">
-						<inp2:c_InitCatalog render_as="tab_headers" special="$special"/>
-					<inp2:m_else/>
-						<inp2:c_InitCatalog render_as="tab_headers" special="$special" replace_m="yes"/>
-					</inp2:m_if>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
\ No newline at end of file
+<inp2:m_DefineElement name="item_selector_catalog_tabs">
+	<inp2:m_if check="m_Get" name="t" equals_to="catalog/item_selector/item_selector_catalog">
+		<inp2:c_InitCatalog render_as="tab_headers" special="$special"/>
+	<inp2:m_else/>
+		<inp2:c_InitCatalog render_as="tab_headers" special="$special" replace_m="yes"/>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<inp2:m_RenderElement name="tabs_container" tabs_render_as="item_selector_catalog_tabs" special="$special" skip_prefixes="$skip_prefixes"/>
\ No newline at end of file