diff --git a/app/assets/stylesheets/admin/orders.css.scss b/app/assets/stylesheets/admin/orders.css.scss
index 46e6b8aa0f..33c5a4a3e8 100644
--- a/app/assets/stylesheets/admin/orders.css.scss
+++ b/app/assets/stylesheets/admin/orders.css.scss
@@ -87,3 +87,7 @@ div#group_buy_calculation {
 th.actions {
   white-space: nowrap;
 }
+
+table.index td.actions {
+  text-align: left;
+}
diff --git a/app/overrides/add_capture_order_shortcut.rb b/app/overrides/add_capture_order_shortcut.rb
deleted file mode 100644
index db6947cf08..0000000000
--- a/app/overrides/add_capture_order_shortcut.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-Deface::Override.new(:virtual_path    => "spree/admin/orders/index",
-                      :name           => "add_capture_order_shortcut",
-                      :insert_bottom  => "[data-hook='admin_orders_index_row_actions']",
-                      :partial        => 'spree/admin/orders/capture'
-                    )
-# And align actions column (not spree standard, but looks better IMO)
-Deface::Override.new(:virtual_path    => "spree/admin/orders/index",
-                      :name           => "add_capture_order_shortcut_align",
-                      :set_attributes => "[data-hook='admin_orders_index_row_actions']",
-                      :attributes     => {:class => "actions", :style => "text-align:left;"} #removes 'align-center' class
-                    )
diff --git a/app/views/spree/admin/orders/index.html.haml b/app/views/spree/admin/orders/index.html.haml
index 507fedc8fc..dae0c47089 100644
--- a/app/views/spree/admin/orders/index.html.haml
+++ b/app/views/spree/admin/orders/index.html.haml
@@ -95,11 +95,12 @@
             %span{class: "state #{order.shipment_state}"}= link_to t("shipment_states.#{order.shipment_state}"), admin_order_shipments_path(order) if order.shipment_state
           %td= mail_to order.email
           %td.align-center= order.display_total.to_html
-          %td.actions.align-center{"data-hook" => "admin_orders_index_row_actions"}
+          %td.actions{"data-hook" => "admin_orders_index_row_actions"}
             = link_to_edit_url edit_admin_order_path(order), :title => "admin_edit_#{dom_id(order)}", :no_text => true
             - if order.ready_to_ship?
               - # copied from backend/app/views/spree/admin/payments/_list.html.erb
               = link_to_with_icon "icon-road", t('admin.orders.index.ship'), fire_admin_order_url(order, :e => 'ship'), :method => :put, :no_text => true, :data => {:action => 'ship', :confirm => t(:are_you_sure)}
+            = render partial: 'spree/admin/orders/capture', locals: {order: order}
 - else
   .no-objects-found
     = t(:no_orders_found)