diff --git a/app/overrides/spree/admin/payments/new/add_angular_to_form.html.haml.deface b/app/overrides/spree/admin/payments/new/add_angular_to_form.html.haml.deface
deleted file mode 100644
index b2c55d6a8b..0000000000
--- a/app/overrides/spree/admin/payments/new/add_angular_to_form.html.haml.deface
+++ /dev/null
@@ -1,2 +0,0 @@
-/replace 'code[erb-loud]:contains("form_for @payment")'
-= form_for @payment, :url => admin_order_payments_path(@order), :html => {"ng-app" => "admin.payments", "ng-controller" => "PaymentCtrl"} do |f|
diff --git a/app/overrides/spree/admin/payments/new/add_save_bar.html.haml.deface b/app/overrides/spree/admin/payments/new/add_save_bar.html.haml.deface
deleted file mode 100644
index 209c4c820b..0000000000
--- a/app/overrides/spree/admin/payments/new/add_save_bar.html.haml.deface
+++ /dev/null
@@ -1,3 +0,0 @@
-/ insert_before "fieldset.no-border-top"
-
-%save-bar{ persist: "true" }
diff --git a/app/overrides/spree/admin/payments/new/override_submit_for_button.html.haml.deface b/app/overrides/spree/admin/payments/new/override_submit_for_button.html.haml.deface
deleted file mode 100644
index 4fb4d91ad5..0000000000
--- a/app/overrides/spree/admin/payments/new/override_submit_for_button.html.haml.deface
+++ /dev/null
@@ -1,2 +0,0 @@
-/replace 'code[erb-loud]:contains("button @order.cart?")'
-= button_tag t(:update), type: 'button', "ng-click" => "submitPayment()"
diff --git a/app/views/spree/admin/payments/new.html.haml b/app/views/spree/admin/payments/new.html.haml
index 8c1ffb9f14..63176c9860 100644
--- a/app/views/spree/admin/payments/new.html.haml
+++ b/app/views/spree/admin/payments/new.html.haml
@@ -10,11 +10,12 @@
 - if @payment_methods.any?
   = render partial: 'spree/shared/error_messages', locals: { target: @payment }
 
-  = form_for @payment, url: admin_order_payments_path(@order) do |f|
+  = form_for @payment, url: admin_order_payments_path(@order), html: {"ng-app" => "admin.payments", "ng-controller" => "PaymentCtrl"} do |f|
+    %save-bar{ persist: "true" }
     %fieldset.no-border-top
       = render partial: 'form', locals: { f: f }
       .filter-actions.actions{"data-hook" => "buttons"}
-        = button @order.cart? ? Spree.t('actions.continue') : Spree.t('actions.update'), @order.cart? ? 'icon-arrow-right' : 'icon-refresh'
+        = button_tag t(:update), type: 'button', "ng-click" => "submitPayment()"
 
 - else
   = Spree.t(:cannot_create_payment_without_payment_methods)