Index: branches/RC/themes/default2007/platform/elements/header.tpl
===================================================================
diff -u -r10388 -r11247
--- branches/RC/themes/default2007/platform/elements/header.tpl	(.../header.tpl)	(revision 10388)
+++ branches/RC/themes/default2007/platform/elements/header.tpl	(.../header.tpl)	(revision 11247)
@@ -44,21 +44,7 @@
 					<!--## /THEME DROP-DOWN ##-->
 
 					<inp2:m_if check="m_ModuleEnabled" module="In-Commerce">
-						<td width="1">
-							<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/languages_separator.gif" width="1" height="22" alt="" />
-						</td>
-						<td class="top-select-padding">
-							<form method="post" name="cur_form"  id="cur_form" action="<inp2:m_FormAction />">
-								&nbsp; <inp2:m_Phrase label="lu_YourCurrency"/>:
-								<input type="hidden" name="events[curr][OnChangeCurrency]" value="" />
-								<select name="curr_iso" class="input-select" onchange="document.getElementById('cur_form').submit()">
-									<inp2:m_DefineElement name="currency">
-										<option value="<inp2:Field name="ISO"/>" <inp2:m_if check="SelectedCurrency">selected="selected"</inp2:m_if> ><inp2:Field name="ISO"/></option>
-									</inp2:m_DefineElement>
-									<inp2:curr_ListCurrencies render_as="currency" no_table="1"/>
-								</select>
-							</form>
-						</td>
+						<inp2:m_Include t="in-commerce/elements/currency_picker"/>
 					</inp2:m_if>
 				</tr>
 			</table>