diff --git a/app/overrides/spree/admin/shipping_methods/edit/add_hubs_sidebar.html.haml.deface b/app/overrides/spree/admin/shipping_methods/edit/add_hubs_sidebar.html.haml.deface
deleted file mode 100644
index 057013c5a6..0000000000
--- a/app/overrides/spree/admin/shipping_methods/edit/add_hubs_sidebar.html.haml.deface
+++ /dev/null
@@ -1,4 +0,0 @@
-/ insert_after "code[erb-loud]:contains(\"render :partial => 'form', :locals => { :f => f }\")"
-
-.one.column  
-= render :partial => 'spree/admin/shared/hubs_sidebar', :locals => { f: f, klass: :shipping_method }
\ No newline at end of file
diff --git a/app/overrides/spree/admin/shipping_methods/edit/add_new_shipping_method_buttton.html.haml.deface b/app/overrides/spree/admin/shipping_methods/edit/add_new_shipping_method_buttton.html.haml.deface
deleted file mode 100644
index b92e713258..0000000000
--- a/app/overrides/spree/admin/shipping_methods/edit/add_new_shipping_method_buttton.html.haml.deface
+++ /dev/null
@@ -1,4 +0,0 @@
-/ insert_after "code[erb-silent]:contains('content_for :page_actions do')"
-
-%li
-  = button_link_to t(:new), spree.new_admin_shipping_method_path, :icon => 'icon-plus' %>
\ No newline at end of file
diff --git a/app/overrides/spree/admin/shipping_methods/edit/remove_configuration_sidebar.deface b/app/overrides/spree/admin/shipping_methods/edit/remove_configuration_sidebar.deface
deleted file mode 100644
index cc3fbcdee1..0000000000
--- a/app/overrides/spree/admin/shipping_methods/edit/remove_configuration_sidebar.deface
+++ /dev/null
@@ -1 +0,0 @@
-remove "code[erb-loud]:contains(\"render :partial => 'spree/admin/shared/configuration_menu'\")"
\ No newline at end of file
diff --git a/app/views/spree/admin/shipping_methods/edit.html.haml b/app/views/spree/admin/shipping_methods/edit.html.haml
new file mode 100644
index 0000000000..f5c57eb8d0
--- /dev/null
+++ b/app/views/spree/admin/shipping_methods/edit.html.haml
@@ -0,0 +1,18 @@
+- content_for :page_title do
+  = Spree.t(:editing_shipping_method)
+- content_for :page_actions do
+  %li
+    = button_link_to t(:new), spree.new_admin_shipping_method_path, icon: 'icon-plus'
+  %li
+    = button_link_to Spree.t(:back_to_shipping_methods_list), spree.admin_shipping_methods_path, icon: 'icon-arrow-left'
+%div
+  = render partial: 'spree/shared/error_messages', locals: { target: @shipping_method }
+%div
+  = form_for [:admin, @shipping_method] do |f|
+    %fieldset.no-border-top
+      = render partial: 'form', locals: { f: f }
+      .one.column  
+      = render partial: 'spree/admin/shared/hubs_sidebar', locals: { f: f, klass: :shipping_method }
+      .clear
+      %div
+        = render partial: 'spree/admin/shared/edit_resource_links'