diff --git a/app/views/spree/admin/orders/customer_details/_address_form.html.haml b/app/views/spree/admin/orders/customer_details/_address_form.html.haml
index d1945166a6..a976d3d027 100644
--- a/app/views/spree/admin/orders/customer_details/_address_form.html.haml
+++ b/app/views/spree/admin/orders/customer_details/_address_form.html.haml
@@ -1,6 +1,6 @@
 - if use_billing
-  .field{:style => "position: absolute;margin-top: -15px;right: 0;"}
-    %span{"data-hook" => "use_billing"}
+  .field{style: "position: absolute;margin-top: -15px;right: 0;"}
+    %span
       = check_box_tag 'order[use_billing]', '1', (!(@order.bill_address.empty? && @order.ship_address.empty?) && @order.bill_address.same_as?(@order.ship_address))
       = label_tag 'order[use_billing]', Spree.t(:use_billing_address)
 
@@ -8,43 +8,43 @@
 - shipping_or_billing = is_shipping_address ? 'shipping' : 'billing'
 - s_or_b = is_shipping_address ? 's' : 'b'
 
-%div{"data-hook" => "address_fields", :id => "#{is_shipping_address ? 'shipping' : 'billing'}", :style => "display: #{(use_billing  (!(@order.bill_address.empty?  @order.ship_address.empty?)  @order.bill_address.eql?(@order.ship_address))) ? 'none' : 'block'}"}
-  %div{:class => "field #{"#{shipping_or_billing}-row"}"}
+%div{id: "#{is_shipping_address ? 'shipping' : 'billing'}", style: "display: #{(use_billing  (!(@order.bill_address.empty?  @order.ship_address.empty?)  @order.bill_address.eql?(@order.ship_address))) ? 'none' : 'block'}"}
+  %div{class: "field #{"#{shipping_or_billing}-row"}"}
     = f.label :firstname, Spree.t(:first_name) + ':'
-    = f.text_field :firstname, :class => 'fullwidth'
-  %div{:class => "field #{"#{shipping_or_billing}-row"}"}
+    = f.text_field :firstname, class: 'fullwidth'
+  %div{class: "field #{"#{shipping_or_billing}-row"}"}
     = f.label :lastname, Spree.t(:last_name) + ':'
-    = f.text_field :lastname, :class => 'fullwidth'
+    = f.text_field :lastname, class: 'fullwidth'
   - if Spree::Config[:company]
-    %div{:class => "field #{"#{shipping_or_billing}-row"}"}
+    %div{class: "field #{"#{shipping_or_billing}-row"}"}
       = f.label :company, Spree.t(:company) + ':'
-      = f.text_field :company, :class => 'fullwidth'
-  %div{:class => "field #{"#{shipping_or_billing}-row"}"}
+      = f.text_field :company, class: 'fullwidth'
+  %div{class: "field #{"#{shipping_or_billing}-row"}"}
     = f.label :address1, Spree.t(:street_address) + ':'
-    = f.text_field :address1, :class => 'fullwidth'
-  %div{:class => "field #{"#{shipping_or_billing}-row"}"}
+    = f.text_field :address1, class: 'fullwidth'
+  %div{class: "field #{"#{shipping_or_billing}-row"}"}
     = f.label :address2, Spree.t(:street_address_2) + ':'
-    = f.text_field :address2, :class => 'fullwidth'
-  %div{:class => "field #{"#{shipping_or_billing}-row"}"}
+    = f.text_field :address2, class: 'fullwidth'
+  %div{class: "field #{"#{shipping_or_billing}-row"}"}
     = f.label :city, Spree.t(:city) + ':'
-    = f.text_field :city, :class => 'fullwidth'
-  %div{:class => "field #{"#{shipping_or_billing}-row"}"}
+    = f.text_field :city, class: 'fullwidth'
+  %div{class: "field #{"#{shipping_or_billing}-row"}"}
     = f.label :zipcode, Spree.t(:zip) + ':'
-    = f.text_field :zipcode, :class => 'fullwidth'
-  %div{:class => "field #{"#{shipping_or_billing}-row"}"}
+    = f.text_field :zipcode, class: 'fullwidth'
+  %div{class: "field #{"#{shipping_or_billing}-row"}"}
     = f.label :country_id, Spree.t(:country) + ':'
-    %span{:id => "#{s_or_b}country"}
-      = f.collection_select :country_id, available_countries, :id, :name, {}, {:class => 'select2 fullwidth'}
-  %div{:class => "field #{"#{shipping_or_billing}-row"}"}
+    %span{id: "#{s_or_b}country"}
+      = f.collection_select :country_id, available_countries, :id, :name, {}, {class: 'select2 fullwidth'}
+  %div{class: "field #{"#{shipping_or_billing}-row"}"}
     = f.label :state_id, Spree.t(:state) + ':'
-    %span{:id => "#{s_or_b}state"}
+    %span{id: "#{s_or_b}state"}
       = f.text_field :state_name,                                                      |
-         :style => "display: #{f.object.country.states.empty? ? 'block' : 'none' };",  |
-        :disabled => !f.object.country.states.empty?, :class => 'fullwidth state_name' |
-      = f.collection_select :state_id, f.object.country.states.sort, :id, :name, {:include_blank => true}, {:class => 'select2 fullwidth', :style => "display: #{f.object.country.states.empty? ? 'none' : 'block' };", :disabled => f.object.country.states.empty?}
-  %div{:class => "field #{"#{shipping_or_billing}-row"}"}
+         style: "display: #{f.object.country.states.empty? ? 'block' : 'none' };",  |
+        disabled: !f.object.country.states.empty?, class: 'fullwidth state_name' |
+      = f.collection_select :state_id, f.object.country.states.sort, :id, :name, {include_blank: true}, {class: 'select2 fullwidth', style: "display: #{f.object.country.states.empty? ? 'none' : 'block' };", disabled: f.object.country.states.empty?}
+  %div{class: "field #{"#{shipping_or_billing}-row"}"}
     = f.label :phone, Spree.t(:phone) + ':'
-    = f.phone_field :phone, :class => 'fullwidth'
+    = f.phone_field :phone, class: 'fullwidth'
 
 - content_for :head do
   = javascript_tag do