diff --git a/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl b/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
index b0f0bd01e..d75c82432 100644
--- a/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
+++ b/admin-dev/themes/default/template/controllers/translations/helpers/view/main.tpl
@@ -73,9 +73,9 @@
 			<div class="row">
 				<input type="hidden" name="controller" value="AdminTranslations" />
 				<input type="hidden" name="lang" id="translation_lang" value="0" />
-				<label class="control-label col-lg-3">{l s='Type of translation:'}</label>
-				<div class="col-lg-6">
-					<select name="type">
+				<label class="control-label col-lg-3" for="type">{l s='Type of translation:'}</label>
+				<div class="col-lg-4">
+					<select name="type" id="type">
 						{foreach $translations_type as $type => $array}
 							<option value="{$type}">{$array.name}</option>
 						{/foreach}
@@ -83,9 +83,9 @@
 				</div>
 			</div>
 			<div class="row">
-				<label class="control-label col-lg-3">{l s='Choose your theme:'}</label>
-				<div class="col-lg-6">
-					<select name="theme">
+				<label class="control-label col-lg-3" for="theme">{l s='Choose your theme:'}</label>
+				<div class="col-lg-4">
+					<select name="theme" id="theme">
 						<option value="">{l s='Core (no theme selected)'}</option>
 						{foreach $themes as $theme}
 							<option value="{$theme->directory}" {if $id_theme_current == $theme->id}selected=selected{/if}>{$theme->name}</option>
@@ -94,12 +94,11 @@
 				</div>
 			</div>
 			<div class="row">
-				{foreach from=$languages item=language}
-				<div class="input-group col-lg-12 translatable-field lang-{$language.id_lang}">
+				<label class="control-label col-lg-3" for="language-button">{l s='Select your language:'}</label>
+				<div class="input-group col-lg-4">
 					<div class="input-group-btn">
-						<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-							<img src="{$base_url}/img/l/{$language.id_lang|intval}.jpg" alt="">
-							{$language.iso_code}
+						<button type="button" id="language-button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+							{l s='Language'}
 							<span class="caret"></span>
 						</button>
 						<ul class="dropdown-menu">
@@ -114,13 +113,6 @@
 						</ul>
 					</div>
 				</div>
-				{/foreach}
-			</div>
-				{*{foreach $languages as $language}
-					<a href="javascript:chooseTypeTranslation('{$language['iso_code']}');">
-						<img src="{$theme_lang_dir}{$language['id_lang']}.jpg" alt="{$language['iso_code']}" title="{$language['iso_code']}" />
-					</a>
-				{/foreach}*}
 				<input type="hidden" name="token" value="{$token}" />
 			</div>
 		</fieldset>
@@ -132,32 +124,30 @@
 				{l s='Add / Update a language'}
 			</h3>
 			<div id="submitAddLangContent" class="row">
-				<div class="col-lg-12">
-					<p class="alert alert-warning">
-						{l s='You can add or update a language directly from the PrestaShop website here:'}<br/>
-						{l s='If you choose to update an existing language pack, all of your previous customization\'s in the theme named "Default" will be lost. This includes Front Office expressions and default email templates.'}
-					</p>
-					{if $packs_to_update || $packs_to_install}
-						<label class="control-label col-lg-4">{l s='Please select the language you want to add or update:'}</label>
-						<div class="col-lg-5">
-							<select id="params_import_language" name="params_import_language">
-								<optgroup label="{l s='Update a language'}">
-									{foreach $packs_to_update as $lang_pack}
-										<option value="{$lang_pack['iso_code']}|{$lang_pack['version']}">{$lang_pack['name']}</option>
-									{/foreach}
-								</optgroup>
-								<optgroup label="{l s='Add a language'}">		
-									{foreach $packs_to_install as $lang_pack}
-										<option value="{$lang_pack['iso_code']}|{$lang_pack['version']}">{$lang_pack['name']}</option>
-									{/foreach}
-								</optgroup>
-							</select> 
-						</div>
-						<input type="submit" value="{l s='Add or update a language'}" name="submitAddLanguage" class="btn btn-default" />
-					{else}
-						<p class="text-danger">{l s='Cannot connect to the PrestaShop website to get the language list.'}</p></div>
-					{/if}
-				</div>
+				<p class="alert alert-warning">
+					{l s='You can add or update a language directly from the PrestaShop website here:'}<br/>
+					{l s='If you choose to update an existing language pack, all of your previous customization\'s in the theme named "Default" will be lost. This includes Front Office expressions and default email templates.'}
+				</p>
+				{if $packs_to_update || $packs_to_install}
+					<label class="control-label col-lg-3" for="params_import_language">{l s='Please select the language you want to add or update:'}</label>
+					<div class="col-lg-4">
+						<select id="params_import_language" name="params_import_language">
+							<optgroup label="{l s='Update a language'}">
+								{foreach $packs_to_update as $lang_pack}
+									<option value="{$lang_pack['iso_code']}|{$lang_pack['version']}">{$lang_pack['name']}</option>
+								{/foreach}
+							</optgroup>
+							<optgroup label="{l s='Add a language'}">		
+								{foreach $packs_to_install as $lang_pack}
+									<option value="{$lang_pack['iso_code']}|{$lang_pack['version']}">{$lang_pack['name']}</option>
+								{/foreach}
+							</optgroup>
+						</select> 
+					</div>
+					<input type="submit" value="{l s='Add or update a language'}" name="submitAddLanguage" class="btn btn-default" />
+				{else}
+					<p class="text-danger">{l s='Cannot connect to the PrestaShop website to get the language list.'}</p>
+				{/if}				
 			</div>
 		</fieldset>
 	</form>
@@ -168,33 +158,29 @@
 				<i class="icon-download"></i>
 				{l s='Import a language pack manually'}
 			</h3>
-			<div id="submitImportContent" class="row">
-				<div class="col-lg-12">
-					<p class="alert alert-warning">
-						{l s='If the language file format is: isocode.gzip (e.g. us.gzip), and the language corresponding to this package does not exist, it will automatically be created.'}
-						{l s='Warning: This will replace all of the existing data inside the destination language.'}
-					</p>
-					<div class="row">
-						<label for="importLanguage" class="control-label col-lg-4">{l s='Language pack to import:'}</label>
-						<div class="col-lg-5">
-							<input type="file" name="file" id="importLanguage"/>
-						</div>
-					</div>
-					<div class="row">
-						<label for="selectThemeForImport" class="control-label col-lg-4">{l s='Select your theme:'}</label>
-						<div class="col-lg-5">
-							<select name="theme[]" id="selectThemeForImport" {if count($themes) > 1}multiple="multiple"{/if} >
-								{foreach $themes as $theme}
-									<option value="{$theme->directory}" selected="selected">{$theme->name} &nbsp;</option>
-								{/foreach}
-							</select>
-						</div>
-					</div>
-					<div class="row">
-						<div class="col-lg-8 pull-right">
-							<input type="submit" value="{l s='   Import   '}" name="submitImport" class="btn btn-default" />
-						</div>
-					</div>
+			<p class="alert alert-warning">
+				{l s='If the language file format is: isocode.gzip (e.g. us.gzip), and the language corresponding to this package does not exist, it will automatically be created.'}
+				{l s='Warning: This will replace all of the existing data inside the destination language.'}
+			</p>
+			<div class="row">
+				<label for="importLanguage" class="control-label col-lg-3" for="importLanguage">{l s='Language pack to import:'}</label>
+				<div class="col-lg-4">
+					<input type="file" name="file" id="importLanguage"/>
+				</div>
+			</div>
+			<div class="row">
+				<label for="selectThemeForImport" class="control-label col-lg-3" for="selectThemeForImport">{l s='Select your theme:'}</label>
+				<div class="col-lg-4">
+					<select name="theme[]" id="selectThemeForImport" {if count($themes) > 1}multiple="multiple"{/if} >
+						{foreach $themes as $theme}
+							<option value="{$theme->directory}" selected="selected">{$theme->name} &nbsp;</option>
+						{/foreach}
+					</select>
+				</div>
+			</div>
+			<div class="row">
+				<div class="col-lg-9 pull-right">
+					<input type="submit" value="{l s='   Import   '}" name="submitImport" class="btn btn-default" />
 				</div>
 			</div>
 		</fieldset>
@@ -211,9 +197,9 @@
 				{l s='Choose which theme you\'d like to export your translations to. '}
 			</p>
 			<div class="row">
-				<label class="control-label col-lg-4">{l s='Language:'}</label>
-				<div class="col-lg-5">
-					<select name="iso_code">
+				<label class="control-label col-lg-3" for="iso_code">{l s='Language:'}</label>
+				<div class="col-lg-4">
+					<select name="iso_code" id="iso_code">
 						{foreach $languages as $language}
 							<option value="{$language['iso_code']}">{$language['name']}</option>
 						{/foreach}
@@ -221,9 +207,9 @@
 				</div>
 			</div>
 			<div class="row">
-				<label class="control-label col-lg-4">{l s='Choose your theme:'}</label>
-				<div class="col-lg-5">
-					<select name="theme">
+				<label class="control-label col-lg-3" for="export-theme">{l s='Choose your theme:'}</label>
+				<div class="col-lg-4">
+					<select name="theme" id="export-theme">
 						{foreach $themes as $theme}
 							<option value="{$theme->directory}" {if $id_theme_current == $theme->id}selected=selected{/if}>{$theme->name}</option>
 						{/foreach}
@@ -231,7 +217,7 @@
 				</div>
 			</div>
 			<div class="row">
-				<div class="col-lg-8 pull-right">
+				<div class="col-lg-9 pull-right">
 					<input type="submit" class="btn btn-default" name="submitExport" value="{l s='Export'}" />
 				</div>
 			</div>
@@ -250,43 +236,41 @@
 				{l s='If necessary'}, <b><a href="{$url_create_language}">{l s='you must first create a new language.'}</a></b>.
 			</p>
 			<div class="row">
-				<div class="col-lg-12">
-					<label class="control-label col-lg-2 required"> {l s='From:'}</label>
-					<div class="col-lg-5">
-						<select name="fromLang">
-							{foreach $languages as $language}
-								<option value="{$language['iso_code']}">{$language['name']}</option>
-							{/foreach}
-						</select>
-					</div>
-					<div class="col-lg-5">
-						<select name="fromTheme">
-							{foreach $themes as $theme}
-								<option value="{$theme->directory}" {if $id_theme_current == $theme->id}selected=selected{/if}>{$theme->name}</option>
-							{/foreach}
-						</select>
-					</div>
+				<label class="control-label col-lg-3 required" for="fromLang"> {l s='From:'}</label>
+				<div class="col-lg-4">
+					<select name="fromLang" id="fromLang">
+						{foreach $languages as $language}
+							<option value="{$language['iso_code']}">{$language['name']}</option>
+						{/foreach}
+					</select>
 				</div>
-				<div class="col-lg-12">
-					<label class="control-label col-lg-2">{l s='To:'}</label>
-					<div class="col-lg-5">
-						<select name="toLang">
-							{foreach $languages as $language}
-								<option value="{$language['iso_code']}">{$language['name']}</option>
-							{/foreach}
-						</select>
-					</div>
-					<div class="col-lg-5">
-						<select name="toTheme">
-							{foreach $themes as $theme}
-								<option value="{$theme->directory}" {if $id_theme_current == $theme->id}selected=selected{/if}>{$theme->name}</option>
-							{/foreach}
-						</select>
-					</div>
+				<div class="col-lg-4">
+					<select name="fromTheme">
+						{foreach $themes as $theme}
+							<option value="{$theme->directory}" {if $id_theme_current == $theme->id}selected=selected{/if}>{$theme->name}</option>
+						{/foreach}
+					</select>
 				</div>
 			</div>
 			<div class="row">
-				<div class="col-lg-1 pull-right">
+				<label class="control-label col-lg-3" for="toLang">{l s='To:'}</label>
+				<div class="col-lg-4">
+					<select name="toLang" id="toLang">
+						{foreach $languages as $language}
+							<option value="{$language['iso_code']}">{$language['name']}</option>
+						{/foreach}
+					</select>
+				</div>
+				<div class="col-lg-4">
+					<select name="toTheme">
+						{foreach $themes as $theme}
+							<option value="{$theme->directory}" {if $id_theme_current == $theme->id}selected=selected{/if}>{$theme->name}</option>
+						{/foreach}
+					</select>
+				</div>			
+			</div>
+			<div class="row">
+				<div class="col-lg-9 pull-right">
 					<input type="submit" value="{l s='Copy'}" name="submitCopyLang" class="btn btn-default" />
 				</div>
 			</div>
diff --git a/controllers/admin/AdminTranslationsController.php b/controllers/admin/AdminTranslationsController.php
index 279ccb6fe..b2c80b915 100644
--- a/controllers/admin/AdminTranslationsController.php
+++ b/controllers/admin/AdminTranslationsController.php
@@ -1525,7 +1525,9 @@ class AdminTranslationsControllerCore extends AdminController
 			var openAll = \''.html_entity_decode($this->l('Expand all fieldsets'), ENT_NOQUOTES, 'UTF-8').'\';
 			var closeAll = \''.html_entity_decode($this->l('Close all fieldsets'), ENT_NOQUOTES, 'UTF-8').'\';
 		</script>
-		<input type="button" class="button" id="buttonall" onclick="openCloseAllDiv(\''.$this->type_selected.'_div\', this.value == openAll); toggleElemValue(this.id, openAll, closeAll);" />
+		<div class="row">
+		<input type="button" class="btn btn-default" id="buttonall" onclick="openCloseAllDiv(\''.$this->type_selected.'_div\', this.value == openAll); toggleElemValue(this.id, openAll, closeAll);" />
+		</div>
 		<script type="text/javascript">toggleElemValue(\'buttonall\', '.($closed ? 'openAll' : 'closeAll').', '.($closed ? 'closeAll' : 'openAll').');</script>';
 		return $str_output;
 	}