diff --git a/templates/admin/default/includes/inner-form-toolbar.html b/templates/admin/default/includes/inner-form-toolbar.html
index 65420f265..80cf4c092 100755
--- a/templates/admin/default/includes/inner-form-toolbar.html
+++ b/templates/admin/default/includes/inner-form-toolbar.html
@@ -4,12 +4,13 @@ A toolbar displayed in forms, to display language change flags, submit and close
 Parameters:
 
    - hide_submit_buttons: true / false. If true, only the close button will be deplayed.
+   - show_currencies: true/false. If true, show the currency selection bar
    - page_url: the current page URL. Dafault id $current_url. Used to switchedition anguage.
    - close_url: no default. URL displayed when close button is clicked. If empty, the close button is not displayed.
 *}
 
 <div class="row inner-toolbar">
-    <div class="col-md-6 inner-actions">
+    <div class="col-md-3 inner-actions">
 		<ul class="nav nav-pills">
 		    {loop name="lang_list" type="lang"}
 		    <li {if $ID == $edit_language_id}class="active"{/if}>
@@ -21,6 +22,22 @@ Parameters:
   		</ul>
     </div>
 
+    {if $show_currencies == true}
+    <div class="col-md-3 inner-actions">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="button-group">
+                    {loop name="currency_list" type="currency"}
+                        <a class="btn btn-sm {if $ID == $edit_currency_id}btn-primary{else}btn-default{/if}" href="{url noamp=1 path='/admin/products/update' edit_currency_id=$ID product_id=$product_id current_tab='details'}" title="{intl l='Edit prices in %curr' curr=$NAME}">
+                            {$SYMBOL}
+                        </a>
+                    {/loop}
+                </div>
+            </div>
+        </div>
+    </div>
+    {/if}
+
     <div class="col-md-6 inner-actions">
          {if $hide_submit_buttons != true}
             <button type="submit" name="save_mode" value="stay" class="btn btn-default btn-success" title="{intl l='Save'}">{intl l='Save'} <span class="glyphicon glyphicon-ok"></span></button>
diff --git a/templates/admin/default/includes/product-details-tab.html b/templates/admin/default/includes/product-details-tab.html
index 553bf55e9..a8224a824 100644
--- a/templates/admin/default/includes/product-details-tab.html
+++ b/templates/admin/default/includes/product-details-tab.html
@@ -6,6 +6,7 @@
 	    {include
 	        file = "includes/inner-form-toolbar.html"
             hide_submit_buttons = false
+            show_currencies = true
 
 	        page_url  = "{url path='/admin/products/update' product_id=$ID}"
 	        close_url = "{url path='/admin/categories' category_id=$DEFAULT_CATEGORY}"
@@ -36,24 +37,7 @@
             {/form_field}
         {/loop}
 
-
-        <div class="row">
-            <div class="col-md-12">
-	            <ul class="nav nav-pills">
-	                <li class="disabled"><a href="#">{intl l='Edit prices in:'}</a></li>
-
-	                {loop name="currency_list" type="currency"}
-	                <li {if $ID == $edit_currency_id}class="active"{/if}>
-	                    <a href="{url noamp=1 path='/admin/products/update' edit_currency_id=$ID product_id=$product_id current_tab='details'}" title="{intl l='Edit prices in %curr' curr=$NAME}">
-	                        {$SYMBOL}
-	                    </a>
-	                </li>
-	                {/loop}
-	            </ul>
-            </div>
-        </div>
-
-	        <div class="row">
+	    <div class="row">
 
 	        {* -- Pricing ------------------------------------------------------- *}