diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index 54a701103f..70efcad42e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -413,7 +413,9 @@
                         </td>
                         <td><span title="[% batch_lis.staged_date | html %]">[% batch_lis.staged_date | $KohaDates with_hours => 1 | html %]</span></td>
                         <td>[% batch_lis.num_records | html %]</td>
-                        <td><a href="[% batch_lis.scriptname | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]">Add orders</a></td>
+                        <td class="actions">
+                            <a href="[% batch_lis.scriptname | url %]?import_batch_id=[% batch_lis.import_batch_id | uri %]&amp;basketno=[% basketno | uri %]&amp;booksellerid=[% booksellerid | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Add orders</a>
+                        </td>
                       </tr>
                       [% END %]
                     </tbody>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
index ae5ba5fa03..0c7772384e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt
@@ -43,8 +43,7 @@
          <th>Summary</th>
          <th>Publisher</th>
          <th>Copyright</th>
-         <th>&nbsp;</th>
-         <th>&nbsp;</th>
+         <th>Actions</th>
       </tr>
     </thead>
     <tbody>
@@ -67,13 +66,9 @@
             <td>
                 [% biblio.copyrightdate | html %]
             </td>
-        <td>
-        <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber | uri %]&amp;viewas=html" class="btn btn-default btn-xs previewMARC">View MARC</a>
-        </td>
-            <td>
-            <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% biblio.biblionumber | uri %]" class="btn btn-default btn-xs" title="Order this one">
-                Order
-            </a>
+            <td class="actions">
+                <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% biblio.biblionumber | uri %]&amp;viewas=html" class="previewMARC btn btn-default btn-xs"><i class="fa fa-eye"></i> View MARC</a>
+                <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% biblio.biblionumber | uri %]" title="Order this one" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a>
             </td>
         </tr>
       [% END %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
index 33bc36a74e..c11a8e3567 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
@@ -256,8 +256,7 @@
               <table>
                   <thead>
                       <tr>
-                          <th>&nbsp;</th>
-                          <th>&nbsp;</th>
+                          <th>Actions</th>
                           <th>Barcode</th>
                           <th>Home library</th>
                           <th>Holding library</th>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
index fbb2142aac..0d21ecd573 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/newordersubscription.tt
@@ -68,13 +68,13 @@
                                         <span title="0000-00-00"></span>
                                     [% END %]
                                 </td>
-                                <td>
+                                <td class="actions">
                                     [% IF (sub.alreadyOnOrder) %]
                                         Outstanding order
                                     [% END %]
-                                    [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid%]
-                                        <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% sub.biblionumber | uri %]&amp;from_subscriptionid=[% sub.subscriptionid | uri %]" title="Order this one">
-                                            Place order
+                                    [% IF not sub.aqbooksellerid || booksellerid == sub.aqbooksellerid %]
+                                        <a href="/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;biblionumber=[% sub.biblionumber | uri %]&amp;from_subscriptionid=[% sub.subscriptionid | uri %]" title="Order this one" class="btn btn-default btn-xs">
+                                            <i class="fa fa-plus"></i> Order
                                         </a>
                                     [% ELSE %]
                                         <a title="This subscription depends on another supplier" style="cursor:help">Cannot be ordered</a>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
index e42087c054..9a14ac3d66 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt
@@ -100,30 +100,30 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
 
     [% IF ( breeding_loop ) %]
     <table id="resultst">
-<thead>    <tr>
+    <thead><tr>
         <th>Server</th>
         <th>Title</th>
         <th>Author</th>
         <th>ISBN</th>
         <th>LCCN</th>
-        [% IF Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %]
-        <th>Additional fields</th>
+        [% IF ( Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' ) %]
+            <th>Additional fields</th>
         [% END %]
         <th>Preview</th>
-		<th>&nbsp;</th>
+        <th>&nbsp;</th>
     </tr></thead>
     <tbody>[% FOREACH breeding_loo IN breeding_loop %]
         [% IF ( breeding_loo.breedingid ) %]
 
         <tr>
-            <td>[% breeding_loo.server | html %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri  %]&amp;breedingid=[% breeding_loo.breedingid | html %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>
+            <td>[% breeding_loo.server | html %] <div class="linktools"><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" class="previewData">Preview MARC</a> <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | html %]" class="previewData">Preview card</a> <a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | html %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Order</a> <a href="#" id="closemenu" title="Close this menu"> X </a></div></td>
             <td>[% breeding_loo.title | html %]</td>
             <td>[% breeding_loo.author | html %]</td>
             <td>[% breeding_loo.isbn | html %]</td>
             <td>[% breeding_loo.lccn | html %]</td>
-            [% IF Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %]
+            [% IF ( Koha.Preference('AdditionalFieldsInZ3950ResultSearch') != '' %]
             <td>
-               <dl>
+                <dl>
                   [% FOREACH addnumberfield IN breeding_loo.addnumberfields %]
                     [% FOREACH string IN breeding_loo.$addnumberfield %]
                         <dt>[% addnumberfield | html %]:</dt>
@@ -133,9 +133,18 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
                </dl>
             </td>
             [% END %]
-            <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | html %]" title="Card" class="previewData">Card</a></td>
-            <td><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]">Order</a></td>
-
+            <td>
+                <div class="dropdown">
+                    <a class="btn btn-default btn-xs dropdown-toggle" id="z3950preview[% breeding_loo.breedingid | uri %]" role="button" data-toggle="dropdown" href="#">
+                        Preview <b class="caret"></b>
+                    </a>
+                    <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="z3950preview[% breeding_loo.breedingid | html %]">
+                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData"><i class="fa fa-eye"></i> MARC</a></li>
+                        <li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | uri %]" title="Card" class="previewData"><i class="fa fa-eye"></i> Card</a></li>
+                    </ul>
+                </div>
+            </td>
+            <td class="actions"><a href="/cgi-bin/koha/acqui/neworderempty.pl?frameworkcode=[% frameworkcode | uri %]&amp;breedingid=[% breeding_loo.breedingid | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> Order</a></td>
         </tr>
         [% END %]
     [% END %]</tbody>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
index 5073850d50..17143a7dce 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt
@@ -92,8 +92,20 @@
                       [% END %]
                   </ul>
             </td>
-            <td>[% IF ( reserveloo.thisratio_atleast1 ) %]<p>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.ratiocalc | uri %] --><a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;rr_quantity_to_order=[% reserveloo.ratiocalc | uri %]">[% END %]<b>[% reserveloo.ratiocalc | html %] to order</b>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]</a>[% END %]
-            [% IF ( reserveloo.pendingorders ) %]<br><b>[% reserveloo.pendingorders | html %] pending</b>[% END %]</p>[% END %]</td>
+            <td class="actions">
+                <p>
+                    [% IF ( reserveloo.thisratio_atleast1 ) %]
+                        [% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.ratiocalc | html %] -->
+                            <a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber | uri %]&amp;booksellerid=[% booksellerid | uri %]&amp;basketno=[% basketno | uri %]&amp;rr_quantity_to_order=[% reserveloo.ratiocalc | uri %]" class="btn btn-default btn-xs"><i class="fa fa-plus"></i> [% reserveloo.ratiocalc | html %] to order</a>
+                        [% ELSE %]
+                            <b>[% reserveloo.ratiocalc | html %] to order</b>
+                        [% END %]
+                        [% IF ( reserveloo.pendingorders ) %]<br><b>[% reserveloo.pendingorders | html %] pending</b>[% END %]
+                    [% ELSE %]
+                        0 to order
+                    [% END %]
+                </p>
+            </td>
         </tr>
       [% END %]
       </tbody>
diff --git a/koha-tmpl/intranet-tmpl/prog/js/additem.js b/koha-tmpl/intranet-tmpl/prog/js/additem.js
index 78b5780a7b..a7e93a566e 100644
--- a/koha-tmpl/intranet-tmpl/prog/js/additem.js
+++ b/koha-tmpl/intranet-tmpl/prog/js/additem.js
@@ -87,13 +87,12 @@ function constructTrNode(index, unique_item_fields) {
         'stocknumber', 'ccode', 'itype', 'materials', 'itemnotes'];
 
     var result = "<tr idblock='" + index + "'>";
-    var edit_link = "<a href='#itemfieldset' style='text-decoration:none' onclick='showItem(\"" + index + "\");'>"
+    var edit_link = "<a href='#itemfieldset' style='text-decoration:none' onclick='showItem(\"" + index + "\");' class='btn btn-default btn-xs'><i class='fa fa-pencil'></i> "
         + (window.MSG_ADDITEM_JS_EDIT || "Edit") + "</a>";
     var del_link = "<a style='cursor:pointer' "
-        + "onclick='deleteItemBlock(this, \"" + index + "\", \"" + unique_item_fields + "\");'>"
+        + "onclick='deleteItemBlock(this, \"" + index + "\", \"" + unique_item_fields + "\");' class='btn btn-default btn-xs'><i class='fa fa-trash'></i> "
         + (window.MSG_ADDITEM_JS_DELETE || "Delete") + "</a>";
-    result += "<td>" + edit_link + "</td>";
-    result += "<td>" + del_link + "</td>";
+    result += "<td class='actions'>" + edit_link + " " + del_link + "</td>";
     for(i in fields) {
         var field = fields[i];
         var field_elt = $("#" + index)