diff --git a/admin-dev/themes/template/options.tpl b/admin-dev/themes/template/options.tpl
index 241426d06..4883ad9c1 100644
--- a/admin-dev/themes/template/options.tpl
+++ b/admin-dev/themes/template/options.tpl
@@ -117,23 +117,39 @@
 					echo '</tr>';
 					echo '</table>';
 			*}
-				{elseif $field['type'] == 'textLang'}
-					{foreach $field['languages'] AS $id_lang => $value}
-						<div id="{$key}_{$id_lang}" style="margin-bottom:8px; display: {if $id_lang == $current_id_lang}'block'{else}'none'{/if}; float: left; vertical-align: top;">
-							<input type="text" size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}_{$id_lang}" value="{$value}" />
+				{elseif $field['type'] == 'textLang' || $field['type'] == 'textareaLang'}
+					{if if $field['type'] == 'textLang'}
+						{foreach $field['languages'] AS $id_lang => $value}
+							<div id="{$key}_{$id_lang}" style="margin-bottom:8px; display: {if $id_lang == $current_id_lang}'block'{else}'none'{/if}; float: left; vertical-align: top;">
+								<input type="text" size="{if isset($field['size'])}{$field['size']|intval}{else}5{/if}" name="{$key}_{$id_lang}" value="{$value}" />
+							</div>
+						{/foreach}
+					{elseif $field['type'] == 'textareaLang' }
+						{foreach $field['languages'] AS $id_lang => $value}
+							<div id="{$key}_{$id_lang}" style="display: {if $id_lang == $current_id_lang}block{else}none{/if}; float: left;">
+								<textarea rows="{$field['rows']}" cols="{$field['cols']|intval}"  name="{$key}_{$id_lang}">{$value|replace:'\r\n':"\n"}</textarea>
+							</div>
+						{/foreach}
+					{/if}
+					{if count($languages) > 1}
+						<div class="displayed_flag">
+							<img src="../img/l/{$current_id_lang}.jpg"
+								class="pointer"
+								id="language_current_{$key}"
+								onclick="toggleLanguageFlags(this);" />
 						</div>
-					{/foreach}
-					{$field['flags']}
-				{elseif $field['type'] == 'textareaLang'}
-					{foreach $field['languages'] AS $id_lang => $value}
-						<div id="{$key}_{$id_lang}" style="display: {if $id_lang == $current_id_lang}block{else}none{/if}; float: left;">
-							<textarea rows="{$field['rows']}" cols="{$field['cols']|intval}"  name="{$key}_{$id_lang}">{$value|replace:'\r\n':"\n"}</textarea>
+						<div id="languages_{$key}" class="language_flags">
+							{l s='Choose language:'}<br /><br />
+							{foreach $languages as $language}
+									<img src="../img/l/{$language.id_lang}.jpg"
+										class="pointer"
+										alt="{$language.name}"
+										title="{$language.name}"
+										onclick="changeLanguage('{$key}', '{$key}', {$language.id_lang}, '{$language.iso_code}');" />
+							{/foreach}
 						</div>
-					{/foreach}
-					{$field['flags']}
+					{/if}
 					<br style="clear:both">			
-					
-					
 				{/if}
 				{if isset($field['method'])}$field['method']{/if}
 		
diff --git a/classes/Helper.php b/classes/Helper.php
index b7f823c62..e237a4ba5 100755
--- a/classes/Helper.php
+++ b/classes/Helper.php
@@ -235,38 +235,6 @@ class HelperCore
 		return str_replace('"', '&quot;', ($addslashes ? addslashes($str) : stripslashes($str)));
 	}
 
-	/**
-	  * Display flags in forms for translations
-	  *
-	  * @param array $languages All languages available
-	  * @param integer $default_language Default language id
-	  * @param string $ids Multilingual div ids in form
-	  * @param string $id Current div id]
-	  * @param boolean $return define the return way : false for a display, true for a return
-	  * @param boolean $use_vars_instead_of_ids use an js vars instead of ids seperate by "¤"
-	  */
-	public function displayFlags($languages, $default_language, $ids, $id, $return = false, $use_vars_instead_of_ids = false)
-	{
-		if (count($languages) == 1)
-			return false;
-		$output = '
-		<div class="displayed_flag">
-			<img src="../img/l/'.$default_language.'.jpg" class="pointer" id="language_current_'.$id.'" onclick="toggleLanguageFlags(this);" alt="" />
-		</div>
-		<div id="languages_'.$id.'" class="language_flags">
-			'.$this->l('Choose language:').'<br /><br />';
-		foreach ($languages as $language)
-			if($use_vars_instead_of_ids)
-				$output .= '<img src="../img/l/'.(int)($language['id_lang']).'.jpg" class="pointer" alt="'.$language['name'].'" title="'.$language['name'].'" onclick="changeLanguage(\''.$id.'\', '.$ids.', '.$language['id_lang'].', \''.$language['iso_code'].'\');" /> ';
-			else
-			$output .= '<img src="../img/l/'.(int)($language['id_lang']).'.jpg" class="pointer" alt="'.$language['name'].'" title="'.$language['name'].'" onclick="changeLanguage(\''.$id.'\', \''.$ids.'\', '.$language['id_lang'].', \''.$language['iso_code'].'\');" /> ';
-		$output .= '</div>';
-
-		if ($return)
-			return $output;
-		echo $output;
-	}
-
 	protected function displayAssoShop($type = 'shop')
 	{
 		if (!Shop::isFeatureActive() || (!$this->id && $this->context->shop->getContextType() != Shop::CONTEXT_ALL))
diff --git a/classes/HelperOptions.php b/classes/HelperOptions.php
index f0396b5fe..a4e50c67c 100644
--- a/classes/HelperOptions.php
+++ b/classes/HelperOptions.php
@@ -125,6 +125,7 @@ class HelperOptionsCore extends Helper
 			'option_list' => $option_list,
 			'current_id_lang' => $this->context->language->id,
 			'required_fields' => isset($required_fields) ? $required_fields : false,
+			'languages' => $languages
 		));
 		return $this->context->smarty->fetch(_PS_ADMIN_DIR_.'/themes/template/'.$this->tpl);
 	}
@@ -157,7 +158,6 @@ class HelperOptionsCore extends Helper
 		echo '</table>';
 	}
 
-
 	/**
 	 * Type = selectLang
 	 * @ TODO