diff --git a/base_usability/__openerp__.py b/base_usability/__openerp__.py
index d59193c..7f336f5 100644
--- a/base_usability/__openerp__.py
+++ b/base_usability/__openerp__.py
@@ -46,6 +46,7 @@ It displays the Local modules by default in tree view (instead of Kanban) filter
     'depends': ['base', 'mail'],
     'data': [
         'partner_view.xml',
+        'country_view.xml',
         'module_view.xml',
         'translation_view.xml',
         'security/ir.model.access.csv',
diff --git a/base_usability/country_view.xml b/base_usability/country_view.xml
new file mode 100644
index 0000000..fcb048c
--- /dev/null
+++ b/base_usability/country_view.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+   Copyright (C) 2015 Akretion (http://www.akretion.com/)
+   @author: Alexis de Lattre <alexis.delattre@akretion.com>
+   The licence is in the file __openerp__.py
+-->
+
+<openerp>
+<data>
+
+<record id="res_country_state_search" model="ir.ui.view">
+    <field name="name">base_usability.res.country.state.search</field>
+    <field name="model">res.country.state</field>
+    <field name="arch" type="xml">
+        <search string="Search States">
+            <field name="name" filter_domain="['|', ('name', 'ilike', self), ('code', '=', self)]" string="Name or Code"/>
+            <field name="code"/>
+            <field name="country_id"/>
+            <group string="Group By" name="groupby">
+                <filter name="country_groupby" string="Country" context="{'group_by': 'country_id'}"/>
+            </group>
+        </search>
+    </field>
+</record>
+
+<record id="res_country_search" model="ir.ui.view">
+    <field name="name">base_usability.res.country.search</field>
+    <field name="model">res.country</field>
+    <field name="arch" type="xml">
+        <search string="Search Countries">
+            <field name="name" filter_domain="['|', ('name', 'ilike', self), ('code', '=', self)]" string="Name or Code"/>
+            <field name="code"/>
+            <field name="currency_id"/>
+            <group string="Group By" name="groupby">
+                <filter name="currency_groupby" string="Currency" context="{'group_by': 'currency_id'}"/>
+            </group>
+        </search>
+    </field>
+</record>
+
+<record id="view_country_form" model="ir.ui.view">
+    <field name="name">base_usability.res.country.form</field>
+    <field name="model">res.country</field>
+    <field name="inherit_id" ref="base.view_country_form"/>
+    <field name="arch" type="xml">
+        <field name="currency_id" position="after">
+            <field name="country_group_ids" widget="many2many_tags"/>
+        </field>
+    </field>
+</record>
+
+</data>
+</openerp>