diff --git a/addons/account/views/account_config_settings_views.xml b/addons/account/views/account_config_settings_views.xml
index c3626626056..c0d98d69fab 100644
--- a/addons/account/views/account_config_settings_views.xml
+++ b/addons/account/views/account_config_settings_views.xml
@@ -149,7 +149,7 @@
                                     </div>
                                     <div class="content-group" attrs="{'invisible': [('group_multi_currency', '=', False)]}">
                                         <div class="mt16">
-                                            <button name="%(base.action_currency_form)d" icon="fa-arrow-right" type="action" string="Activate Currencies" class="btn-link"/>
+                                            <button name="%(base.action_currency_all_form)d" icon="fa-arrow-right" type="action" string="Activate Other Currencies" class="btn-link"/>
                                         </div>
                                         <div class="row mt16">
                                             <label for="currency_exchange_journal_id" class="col-md-3 o_light_label"/>
diff --git a/addons/point_of_sale/views/pos_config_settings_views.xml b/addons/point_of_sale/views/pos_config_settings_views.xml
index 71b79b54ad1..8edc687273a 100644
--- a/addons/point_of_sale/views/pos_config_settings_views.xml
+++ b/addons/point_of_sale/views/pos_config_settings_views.xml
@@ -87,7 +87,7 @@
                                     </div>
                                     <div class="content-group" attrs="{'invisible': [('group_multi_currency','=',False)]}">
                                         <div class="mt16">
-                                            <button name="%(base.action_currency_form)d" icon="fa-arrow-right" type="action" string="Currencies" class="btn-link"/>
+                                            <button name="%(base.action_currency_all_form)d" icon="fa-arrow-right" type="action" string="Activate Other Currencies" class="btn-link"/>
                                         </div>
                                         <div>
                                             <button name="%(account.action_account_config)d" icon="fa-arrow-right" type="action" string="Advanced Currencies Setup" class="btn-link"/>
diff --git a/addons/sale/views/sale_config_settings_views.xml b/addons/sale/views/sale_config_settings_views.xml
index fa616c5a898..0effa047813 100644
--- a/addons/sale/views/sale_config_settings_views.xml
+++ b/addons/sale/views/sale_config_settings_views.xml
@@ -70,7 +70,7 @@
                             </div>
                             <div class="content-group" attrs="{'invisible': [('group_multi_currency','=',False)]}">
                                 <div class="mt16">
-                                    <button name="%(base.action_currency_form)d" icon="fa-arrow-right" type="action" string="Currencies" class="btn-link"/>
+                                    <button name="%(base.action_currency_all_form)d" icon="fa-arrow-right" type="action" string="Activate Other Currencies" class="btn-link"/>
                                 </div>
                             </div>
                         </div>
diff --git a/addons/website_sale/views/website_config_settings_views.xml b/addons/website_sale/views/website_config_settings_views.xml
index 49379c710be..8c136754817 100644
--- a/addons/website_sale/views/website_config_settings_views.xml
+++ b/addons/website_sale/views/website_config_settings_views.xml
@@ -86,7 +86,7 @@
                             </div>
                             <div class="content-group" attrs="{'invisible': [('group_multi_currency', '=', False)]}">
                                 <div class="mt16">
-                                    <button type="action" name="%(base.action_currency_form)d" string="Currencies" class="btn-link" icon="fa-arrow-right"/>
+                                    <button type="action" name="%(base.action_currency_all_form)d" string="Activate Other Currencies" class="btn-link" icon="fa-arrow-right"/>
                                 </div>
                                 <div>
                                     <button type="action" name="%(account.action_account_config)d" string="Apply Automatic Rates Update" class="btn-link" icon="fa-arrow-right"/>
diff --git a/odoo/addons/base/res/res_company_view.xml b/odoo/addons/base/res/res_company_view.xml
index ef1f334e22d..a3a692ce499 100644
--- a/odoo/addons/base/res/res_company_view.xml
+++ b/odoo/addons/base/res/res_company_view.xml
@@ -38,7 +38,7 @@
                                     <field name="email"/>
                                     <field name="vat"/>
                                     <field name="company_registry"/>
-                                    <field name="currency_id" options="{'no_create': True}" id="company_currency"/>
+                                    <field name="currency_id" options="{'no_create': True, 'no_open': True}" id="company_currency"/>
                                     <field name="parent_id"  groups="base.group_multi_company"/>
                                     <field name="sequence" invisible="1"/>
                                 </group>
diff --git a/odoo/addons/base/res/res_currency_view.xml b/odoo/addons/base/res/res_currency_view.xml
index cddc35dfe2b..db0459dd45a 100644
--- a/odoo/addons/base/res/res_currency_view.xml
+++ b/odoo/addons/base/res/res_currency_view.xml
@@ -89,7 +89,7 @@
                     <field name="rate_ids" invisible="1"/>
                     <field name="date"/>
                     <field name="rate"/>
-                    <field name="active"/>
+                    <field name="active" widget="boolean_toggle"/>
                 </tree>
             </field>
         </record>
@@ -160,7 +160,15 @@
             <field name="view_type">form</field>
             <field name="view_mode">tree,kanban,form</field>
             <field name="search_view_id" ref="view_currency_search"/>
-            <field name="context">{'active_test': False, 'search_default_inactive': 1, 'search_default_active': 1}</field>
+            <field name="context">{'active_test': False, 'search_default_active': 1}</field>
+        </record>
+        <record id="action_currency_all_form" model="ir.actions.act_window">
+            <field name="name">Currencies</field>
+            <field name="res_model">res.currency</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,kanban,form</field>
+            <field name="search_view_id" ref="view_currency_search"/>
+            <field name="context">{'active_test': False}</field>
         </record>
 
         <!-- We override the view res_company here because the action wasn't defined before -->
@@ -170,9 +178,9 @@
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@id='company_currency']" position="after">
-                    <label for="id"/>
-                    <p class="text-muted">
-                        <a href="" type="action" name="%(base.action_currency_form)d">Activate more currencies</a>.
+                    <label for="id" string=""/>
+                    <p class="text-muted oe_edit_only">
+                        <a href="" type="action" name="%(base.action_currency_all_form)d">Activate Other Currencies</a>
                     </p>
                 </xpath>
             </field>