diff --git a/templates/backOffice/default/countries.html b/templates/backOffice/default/countries.html
index 6682097b0..35c6e37a8 100644
--- a/templates/backOffice/default/countries.html
+++ b/templates/backOffice/default/countries.html
@@ -125,12 +125,24 @@
                <input type="hidden" name="{$name}" value="{url path='/admin/configuration/country/update/_ID_'}" />
             {/form_field}
 
-            {form_field form=$form field='title'}
-                <div class="form-group {if $error}has-error{/if}">
-                    <label for="{$label_attr.for}" class="control-label">{$label} : </label>
-                    <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Country title'}">
-                </div>
-            {/form_field}
+            {loop type="lang" name="current-edit-lang" default_only="1"}
+
+                {form_field form=$form field='title'}
+                    <div class="form-group {if $error}has-error{/if}">
+                        <label for="{$label_attr.for}" class="control-label">{$label} : </label>
+                        <div class="input-group">
+                            <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Country title'}">
+                            <span class="input-group-addon"><img src="{image file="assets/img/flags/{$CODE}.png"}" alt="{intl l=$TITLE}" /></span>
+                        </div>
+                        <div class="help-block">{intl l="Enter here the value in the default language (%title)" title=$TITLE}</div>
+                    </div>
+                {/form_field}
+
+                {form_field form=$form field='locale'}
+                    <input type="hidden" name="{$name}" value="{$LOCALE}" />
+                {/form_field}
+
+            {/loop}
 
             {form_field form=$form field='area'}
                 <div class="form-group {if $error}has-error{/if}">
@@ -161,12 +173,6 @@
                     <input type="text" id="{$label_attr.for}" name="{$name}" class="form-control" value="{$value}" title="{$label}" placeholder="{intl l='Alpha code 3'}">
                 </div>
             {/form_field}
-            {loop type="lang" name="default-lang" default_only="1"}
-                <input type="hidden" name="edit_language_id" value="{$ID}" />
-                {form_field form=$form field='locale'}
-                    <input type="hidden" name="{$name}" value="{$LOCALE}" />
-                {/form_field}
-            {/loop}
 
             {module_include location='country_create_form'}
 
diff --git a/templates/backOffice/default/country-edit.html b/templates/backOffice/default/country-edit.html
index 0eaa7fd4c..b3177a1ee 100644
--- a/templates/backOffice/default/country-edit.html
+++ b/templates/backOffice/default/country-edit.html
@@ -32,7 +32,13 @@
 
         						    {form name="thelia.admin.country.modification"}
         						    	<form method="POST" action="{url path="/admin/configuration/country/save/{$ID}"}" {form_enctype form=$form} class="clearfix">
-                                            {include file = "includes/inner-form-toolbar.html"}
+                                            {include
+                                                file = "includes/inner-form-toolbar.html"
+                                                hide_submit_buttons = false
+
+                                                page_url  = {url path="/admin/configuration/country/update/$ID"}
+                                                close_url = {url path="/admin/configuration/countries"}
+                                            }
                                             <div class="row">
             	                                <div class="col-md-12">
                                                     {* Be sure to get the country ID, even if the form could not be validated *}
@@ -41,7 +47,7 @@
                 						        	{form_hidden_fields form=$form}
 
                 						        	{form_field form=$form field='success_url'}
-                						        		<input type="hidden" name="{$name}" value="{url path="/admin/configuration/country/update/{$ID}"}" />
+                						        		<input type="hidden" name="{$name}" value="{url path="/admin/configuration/countries"}" />
                 						        	{/form_field}
 
                                                     {form_field form=$form field='locale'}