diff --git a/core/lib/Thelia/Config/Resources/routing/admin.xml b/core/lib/Thelia/Config/Resources/routing/admin.xml
index 5c9399e27..3ed059e7e 100755
--- a/core/lib/Thelia/Config/Resources/routing/admin.xml
+++ b/core/lib/Thelia/Config/Resources/routing/admin.xml
@@ -290,6 +290,18 @@
 
     <!-- end attribute and feature routes  management -->
 
+    <!-- Countries routes management -->
+
+    <route id="admin.configuration.countries.default" path="/admin/configuration/countries">
+        <default key="_controller">Thelia\Controller\Admin\CountryController::indexAction</default>
+    </route>
+
+    <route id="admin.configuration.countries.create" path="/admin/configuration/countries/create">
+        <default key="_controller">Thelia\Controller\Admin\CountryController::createAction</default>
+    </route>
+
+    <!-- end countries routes  management -->
+
 	<!-- The default route, to display a template -->
 
     <route id="admin.processTemplate" path="/admin/{template}">
diff --git a/core/lib/Thelia/Controller/Admin/CountryController.php b/core/lib/Thelia/Controller/Admin/CountryController.php
new file mode 100644
index 000000000..172552893
--- /dev/null
+++ b/core/lib/Thelia/Controller/Admin/CountryController.php
@@ -0,0 +1,39 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Controller\Admin;
+
+/**
+ * Class CustomerController
+ * @package Thelia\Controller\Admin
+ * @author Manuel Raynaud <mraynaud@openstudio.fr>
+ */
+class CountryController extends BaseAdminController
+{
+    public function indexAction()
+    {
+        if (null !== $response = $this->checkAuth("admin.country.view")) return $response;
+        return $this->render("countries", array("display_country" => 20));
+    }
+
+}
\ No newline at end of file
diff --git a/core/lib/Thelia/Form/CountryCreationForm.php b/core/lib/Thelia/Form/CountryCreationForm.php
new file mode 100644
index 000000000..2c56a1b6a
--- /dev/null
+++ b/core/lib/Thelia/Form/CountryCreationForm.php
@@ -0,0 +1,59 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+namespace Thelia\Form;
+
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Thelia\Core\Translation\Translator;
+
+class CountryCreationForm extends BaseForm
+{
+    protected function buildForm()
+    {
+        $this->formBuilder
+            ->add("title", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                ),
+                "label" => Translator::getInstance()->trans("Category title *"),
+                "label_attr" => array(
+                    "for" => "title"
+                )
+            ))
+            ->add("parent", "integer", array(
+                "constraints" => array(
+                    new NotBlank()
+                )
+            ))
+            ->add("locale", "text", array(
+                "constraints" => array(
+                    new NotBlank()
+                )
+            ))
+        ;
+    }
+
+    public function getName()
+    {
+        return "thelia_country_creation";
+    }
+}
diff --git a/templates/admin/default/countries.html b/templates/admin/default/countries.html
new file mode 100644
index 000000000..b3e2254b8
--- /dev/null
+++ b/templates/admin/default/countries.html
@@ -0,0 +1,168 @@
+{extends file="admin-layout.tpl"}
+
+{block name="page-title"}{intl l='Countries'}{/block}
+
+{block name="check-permissions"}admin.configuration.countries.view{/block}
+
+{block name="main-content"}
+    <div class="countries">
+
+        <div id="wrapper" class="container">
+
+            <ul class="breadcrumb">
+                <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
+                <li><a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a></li>
+                <li><a href="{url path='/admin/configuration/countries'}">{intl l="Countries"}</a></li>
+            </ul>
+
+            {module_include location='countries_top'}
+
+            <div class="row">
+                <div class="col-md-12">
+
+                    <form action="" method="post">
+
+                        <div class="general-block-decorator">
+
+                            <table class="table table-striped table-condensed">
+                               <caption class="clearfix">
+                                    {intl l='Countries'}
+                                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.countries.create"}
+                                        <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new country'}" href="#add_country_dialog" data-toggle="modal">
+                                            <span class="glyphicon glyphicon-plus-sign"></span>
+                                        </a>
+                                    {/loop}
+                                </caption>
+                                <thead>
+                                    <tr>
+                                        <th>ID</th>
+                                        <th>Name</th>
+                                        <th>Default</th>
+                                        <th>Shop</th>
+                                        <th>N° ISO</th>
+                                        <th>ISO Code</th>
+
+                                        {module_include location='countries_table_header'}
+
+                                        <th class="actions">{intl l='Actions'}</th>
+                                    </tr>
+                                </thead>
+
+                                <tbody>
+                                    {loop name="countries" type="country" backend_context="1" lang=$lang_id order=$order}
+                                        <tr>
+                                            <td>{$ID}</td>
+                                            <td>{$TITLE}</td>                                            
+                                            <td>
+                                                <div class="make-switch switch-small switch-radio" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                                    <input class="change-default" type="radio" name="" value="{$ID}" {if $IS_DEFAULT}selected="selected"{/if}/>
+                                                </div>
+                                            </td>
+                                            <td>                                                
+                                                <div class="make-switch switch-small switch-radio" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                                    <input class="change-default" type="radio" name="" value="{$ID}" {if $IS_DEFAULT}selected="selected"{/if}/>
+                                                </div>                                                
+                                            </td>                                            
+                                            <td>{$ISOCODE}</td>
+                                            <td>{$ISOALPHA3}</td>
+
+                                            {module_include location='countries_table_row'}
+
+                                            <td class="actions">
+                                                <div class="btn-group">
+                                                    {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.countries.change"}
+                                                        <a class="btn btn-default btn-xs country-change" title="{intl l='Change this country'}" href="{url path="/admin/configuration/countries/update/{$ID}"}">
+                                                            <span class="glyphicon glyphicon-edit"></span>
+                                                        </a>
+                                                    {/loop}
+
+                                                    {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.countries.delete"}
+                                                        <a class="btn btn-default btn-xs country-delete" title="{intl l='Delete this country'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal">
+                                                            <span class="glyphicon glyphicon-trash"></span>
+                                                        </a>
+                                                    {/loop}
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    {/loop}
+                                    {elseloop rel="countries"}
+                                        <tr>
+                                            <td colspan="8">
+                                                <div class="alert alert-info">
+                                                    {intl l="No country has been created yet. Click the + button to create one."}
+                                                </div>
+                                            </td>
+                                        </tr>
+                                    {/elseloop}
+                                </tbody>
+                            </table>
+
+                        </div>
+
+                    </form>
+
+                </div>
+
+            </div>
+
+            {module_include location='countries_bottom'}
+
+        </div>
+    </div>
+
+    {* Adding a new Country *}
+
+    {form name="thelia.admin.country.creation"}
+
+        {* Capture the dialog body, to pass it to the generic dialog *}
+        {capture "country_creation_dialog"}
+
+            {form_hidden_fields form=$form}
+
+            {form_field form=$form field='success_url'}
+               {* on success, redirect to the edition page, _ID_ is replaced with the created object ID, see controller  *}
+               <input type="hidden" name="{$name}" value="{url path='/admin/country/update' country_id='_ID_'}" />
+            {/form_field}
+
+            {form_field form=$form field='parent'}
+               <input type="hidden" name="{$name}" value="{$current_country_id}" />
+            {/form_field}
+
+            
+
+            {module_include location='country_create_form'}
+
+        {/capture}
+
+        {include
+            file = "includes/generic-create-dialog.html"
+
+            dialog_id    = "add_country_dialog"
+            dialog_title = {intl l="Create a new country"}
+            dialog_body  = {$smarty.capture.country_creation_dialog nofilter}
+
+            dialog_ok_label     = {intl l="Create this country"}
+            dialog_cancel_label = {intl l="Cancel"}
+
+            form_action        = {url path='/admin/configuration/countries/create'}
+            form_enctype       = {form_enctype form=$form}
+            form_error_message = $form_error_message
+        }
+    {/form}
+
+{/block}
+
+{block name="javascript-initialization"}
+
+    {javascripts file='assets/js/bootstrap-switch/bootstrap-switch.js'}
+        <script src="{$asset_url}"></script>
+
+        <script>
+            // Toogle switch on input radio
+            $('.switch-radio').on('switch-change', function () {
+                $('.switch-radio').bootstrapSwitch('toggleRadioState');
+            });
+        </script>
+    {/javascripts}
+
+{/block}
\ No newline at end of file
diff --git a/templates/admin/default/country-edit.html b/templates/admin/default/country-edit.html
new file mode 100644
index 000000000..e69de29bb