Index: branches/1.0.x/elements/header.elm.tpl
===================================================================
diff -u -N -r14747 -r14754
--- branches/1.0.x/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 14747)
+++ branches/1.0.x/elements/header.elm.tpl	(.../header.elm.tpl)	(revision 14754)
@@ -5,32 +5,50 @@
 	</div>
 	<div class="infoblock">
 		<div class="welcome">
+
 			<div class="lang">
-				<div class="<inp2:lang.current_Field name='Locale' db='1'/>">
+				<div <inp2:m_if check="lang.current_Field" name="IconURL">class="with-icon" style="background-image: url(<inp2:m_TemplatesBase/>img/lang/<inp2:lang.current_Field name='IconURL'/>);"<inp2:m_else/>class="without-icon"</inp2:m_if>>
 					<a href="#" id="lang"><inp2:lang.current_Field name='LocalName'/></a>
 				</div>
+
 				<div id="lang-sel" class="plashka">
 					<ul>
-					<inp2:m_DefineElement name="lang_elem" no_editing="1">
-						<li><a href="<inp2:LanguageLink/>" class="<inp2:Field name='Locale' db='1'/><inp2:m_if check='SelectedLanguage'> active</inp2:m_if>"><inp2:Field name="LocalName"/></a></li>
-					</inp2:m_DefineElement>
-					<inp2:lang_ListLanguages render_as="lang_elem" no_table="1"/>
+						<inp2:m_DefineElement name="lang_elem" no_editing="1">
+							<li>
+								<inp2:m_if check="Field" name="IconURL">
+									<a href="<inp2:LanguageLink/>" style="background-image: url(<inp2:m_TemplatesBase/>img/lang/<inp2:Field name='IconURL'/>);" class="with-icon<inp2:m_if check='SelectedLanguage'> active</inp2:m_if>">
+										<inp2:Field name="LocalName"/>
+									</a>
+								<inp2:m_else/>
+									<a href="<inp2:LanguageLink/>" class="without-icon<inp2:m_if check='SelectedLanguage'> active</inp2:m_if>">
+										<inp2:Field name="LocalName"/>
+									</a>
+								</inp2:m_if>
+							</li>
+						</inp2:m_DefineElement>
+
+						<inp2:lang_ListLanguages render_as="lang_elem" no_table="1"/>
 					</ul>
 				</div>
 			</div>
+
 			<div class="currency">
-				<form method="post" name="cur_form"  id="cur_form" action="<inp2:m_FormAction />">
 				<div class="cur">
-					<a href="" id="currency">USD</a>
+					<a href="<inp2:curr.current_CurrencyLink/>" id="currency"><inp2:curr.current_Field name="ISO"/></a>
 				</div>
 				<div id="currency-sel" class="plashka">
 					<ul>
-						<li><a href="#" class="active">USD</a></li>
-						<li><a href="#" class="">DCH</a></li>
-						<li><a href="#" class="">RUS</a></li>
+						<inp2:m_DefineElement name="currency_elem">
+							<li>
+								<a href="<inp2:CurrencyLink/>"<inp2:m_if check='SelectedCurrency'> class="active"</inp2:m_if>>
+									<inp2:Field name="ISO"/>
+								</a>
+							</li>
+						</inp2:m_DefineElement>
+
+						<inp2:curr_ListCurrencies render_as="currency_elem" no_table="1"/>
 					</ul>
 				</div>
-				</form>
 			</div>
 
 			<div class="txt">Welcome! Please <a href="" onclick="TINY.box.show({iframe:'registration.html',width:850,height:570}); return false;">Register</a> for an account or