diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 6cca8e0ce46..047f19bd791 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -184,7 +184,14 @@
                                 name="account_id" groups="account.group_account_user"/>
                             <field name="journal_id" groups="account.group_account_user"
                                 on_change="onchange_journal_id(journal_id, context)" widget="selection"/>
-                            <field name="currency_id" groups="base.group_multi_currency"/>
+                            <label for="currency_id" groups="base.group_multi_currency"/>
+                            <div groups="base.group_multi_currency">
+                                <field name="currency_id" class="oe_inline" readonly="1"/>
+                                <button name="223" type="action" class="oe_inline oe_link oe_edit_only" 
+                                    string="(change)" 
+                                    attrs="{'invisible':[('state','!=','draft')]}" 
+                                    groups="account.group_account_user"/>
+                            </div>
                             <field name="check_total" groups="account.group_supplier_inv_check_total"/>
                         </group>
                     </group>
@@ -333,12 +340,12 @@
 
                             <label for="currency_id" groups="base.group_multi_currency"/>
                             <div groups="base.group_multi_currency">
-                                <field name="currency_id" class="oe_inline"/>
-                                <!-- note fp: I don't think we need this feature ?
-                                <button name="%(action_account_change_currency)d" type="action"
-                                  icon="terp-stock_effects-object-colorize"
+                                <field name="currency_id" class="oe_inline" readonly="1"/>
+                                <button name="%(action_account_change_currency)d" type="action" 
+                                  class="oe_inline oe_link oe_edit_only"
+                                  string="(change)"
                                   attrs="{'invisible':[('state','!=','draft')]}"
-                                  groups="account.group_account_user"/> -->
+                                  groups="account.group_account_user"/>
                             </div>
                         </group>
                     </group>