diff --git a/backend/app/assets/javascripts/spree/backend/shipments.js b/backend/app/assets/javascripts/spree/backend/shipments.js
index 79511974b80..722a6cf8be7 100644
--- a/backend/app/assets/javascripts/spree/backend/shipments.js
+++ b/backend/app/assets/javascripts/spree/backend/shipments.js
@@ -224,8 +224,8 @@ var ShipmentItemView = Backbone.View.extend({
   },
 
   events: {
-    "click .delete-item": "onDelete",
-    "click .split-item": "onSplit",
+    "click button.delete-item": "onDelete",
+    "click button.split-item": "onSplit",
   },
 
   removeSplit: function() {
@@ -286,13 +286,13 @@ var ShipmentEditView = Backbone.View.extend({
   },
 
   events: {
-    "click a.edit-method": "toggleMethodEdit",
-    "click a.cancel-method": "toggleMethodEdit",
-    "click a.save-method": "saveMethod",
+    "click button.edit-method": "toggleMethodEdit",
+    "click button.cancel-method": "toggleMethodEdit",
+    "click button.save-method": "saveMethod",
 
-    "click a.edit-tracking": "toggleTrackingEdit",
-    "click a.cancel-tracking": "toggleTrackingEdit",
-    "click a.save-tracking": "saveTracking",
+    "click button.edit-tracking": "toggleTrackingEdit",
+    "click button.cancel-tracking": "toggleTrackingEdit",
+    "click button.save-tracking": "saveTracking",
   },
 
   toggleMethodEdit: function(e){
diff --git a/backend/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs b/backend/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs
index 3279e6d431d..60dcc671fcd 100644
--- a/backend/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs
+++ b/backend/app/assets/javascripts/spree/backend/templates/variants/line_items_autocomplete_stock.hbs
@@ -20,7 +20,7 @@
 
   <fieldset class="no-border-bottom">
     <legend align="center" class="stock-location">
-      <button class="add_variant"  title="{{ t "add" }}" data-action="add">{{ t "add" }}</button>
+      <button class="add_variant" title="{{ t "add" }}" data-action="add">{{ t "add" }}</button>
     </legend>
   </fieldset>
 </fieldset>
diff --git a/backend/app/assets/javascripts/spree/backend/templates/variants/split.hbs b/backend/app/assets/javascripts/spree/backend/templates/variants/split.hbs
index 2e87c9f5713..23e8c912782 100644
--- a/backend/app/assets/javascripts/spree/backend/templates/variants/split.hbs
+++ b/backend/app/assets/javascripts/spree/backend/templates/variants/split.hbs
@@ -20,6 +20,6 @@
   <input class="quantity" id="item_quantity" type="number" min="1" value="1" max="{{max_quantity}}">
 </td>
 <td class='actions'>
-  <a href='#' class='save-split icon_link fa fa-ok no-text with-tip' title='Save'></a>
-  <a href='#' class='cancel-split icon_link fa fa-cancel no-text with-tip' title='Cancel'></a>
+  <button class="save-split icon_link fa fa-ok no-text with-tip" data-action="save" title="{{ t "save" }}" data-original-title="{{ t "save" }}"></button>
+  <button class="cancel-split icon_link fa fa-cancel no-text with-tip" data-action="cancel" title="{{ t "cancel" }}" data-original-title="{{ t "cancel" }}"></button>
 </td>
diff --git a/backend/app/assets/stylesheets/spree/backend/components/_actions.scss b/backend/app/assets/stylesheets/spree/backend/components/_actions.scss
index e127e03808a..d6c7d531352 100644
--- a/backend/app/assets/stylesheets/spree/backend/components/_actions.scss
+++ b/backend/app/assets/stylesheets/spree/backend/components/_actions.scss
@@ -27,5 +27,9 @@ table tbody tr {
 
   td.actions {
     background-color: transparent !important;
+
+    button {
+      cursor: pointer;
+    }
   }
 }
diff --git a/backend/app/views/spree/admin/orders/_shipment.html.erb b/backend/app/views/spree/admin/orders/_shipment.html.erb
index 723fd693ef9..897a29622a8 100644
--- a/backend/app/views/spree/admin/orders/_shipment.html.erb
+++ b/backend/app/views/spree/admin/orders/_shipment.html.erb
@@ -62,9 +62,9 @@
           </td>
           <td class="actions">
             <% if can? :update, shipment %>
-              <%= link_to '', '#', class: 'save-method fa fa-check no-text with-tip',
+              <%= button_tag '', class: 'save-method fa fa-check no-text with-ti, type: :button',
                 data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save') %>
-              <%= link_to '', '#', class: 'cancel-method fa fa-cancel no-text with-tip',
+              <%= button_tag '', class: 'cancel-method fa fa-cancel no-text with-ti, type: :button',
                 data: {action: 'cancel'}, title: Spree.t('actions.cancel') %>
             <% end %>
           </td>
@@ -85,7 +85,7 @@
 
           <td class="actions">
             <% if can?(:update, shipment) && !shipment.shipped? %>
-              <%= link_to '', '#', class: 'edit-method fa fa-edit no-text with-tip', data: {action: 'edit'}, title: Spree.t('actions.edit') %>
+              <%= button_tag '', class: 'edit-method fa fa-edit no-text with-tip', data: {action: 'edit'}, title: Spree.t('actions.edit'), type: :button %>
             <% end %>
           </td>
         </tr>
@@ -97,8 +97,8 @@
         </td>
         <td class="actions">
           <% if can? :update, shipment %>
-            <%= link_to '', '#', class: 'save-tracking fa fa-check no-text with-tip', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save') %>
-            <%= link_to '', '#', class: 'cancel-tracking fa fa-cancel no-text with-tip', data: {action: 'cancel'}, title: Spree.t('actions.cancel') %>
+            <%= button_tag '', class: 'save-tracking fa fa-check no-text with-tip', data: { action: 'save', 'shipment-number' => shipment.number }, title: Spree.t('actions.save'), type: :button %>
+            <%= button_tag '', class: 'cancel-tracking fa fa-cancel no-text with-tip', data: { action: 'cancel' }, title: Spree.t('actions.cancel'), type: :button %>
           <% end %>
         </td>
       </tr>
@@ -121,7 +121,7 @@
         </td>
         <td class="actions">
           <% if can? :update, shipment %>
-            <%= link_to '', '#', class: 'edit-tracking fa fa-edit no-text with-tip', data: {action: 'edit'}, title: Spree.t('actions.edit') %>
+            <%= button_tag '', class: 'edit-tracking fa fa-edit no-text with-tip', data: {action: 'edit'}, title: Spree.t('actions.edit'), type: :button %>
           <% end %>
         </td>
       </tr>
diff --git a/backend/app/views/spree/admin/orders/_shipment_manifest.html.erb b/backend/app/views/spree/admin/orders/_shipment_manifest.html.erb
index a5ace3d2d96..9d0afcdf8be 100644
--- a/backend/app/views/spree/admin/orders/_shipment_manifest.html.erb
+++ b/backend/app/views/spree/admin/orders/_shipment_manifest.html.erb
@@ -22,8 +22,8 @@
 
     <td class="cart-item-delete actions" data-hook="cart_item_delete">
       <% if can? :update, item %>
-        <%= link_to '', '#', class: 'split-item icon_link fa fa-arrows-h no-text with-tip', data: {action: 'split', 'variant-id' => item.variant.id}, title: Spree.t('actions.split') %>
-        <%= link_to '', '#', class: 'delete-item fa fa-trash no-text with-tip', data: { 'variant-id' => item.variant.id}, title: Spree.t('actions.delete') %>
+        <%= button_tag '', class: 'split-item icon_link fa fa-arrows-h no-text with-tip', data: { action: 'split', 'variant-id' => item.variant.id }, title: Spree.t('actions.split'), type: :button %>
+        <%= button_tag '', class: 'delete-item fa fa-trash no-text with-tip', data: { 'variant-id' => item.variant.id }, title: Spree.t('actions.delete'), type: :button %>
       <% end %>
     </td>
   </tr>