diff --git a/app/assets/javascripts/templates/admin/columns_dropdown.html.haml b/app/assets/javascripts/templates/admin/columns_dropdown.html.haml
index 7895d7070e..d1b002943e 100644
--- a/app/assets/javascripts/templates/admin/columns_dropdown.html.haml
+++ b/app/assets/javascripts/templates/admin/columns_dropdown.html.haml
@@ -2,13 +2,13 @@
   .ofn-drop-down-label
     = "  #{t('admin.columns')}".html_safe
     %span{ 'ng-class' => "expanded && 'icon-caret-up' || !expanded && 'icon-caret-down'" }
-  %div.menu{ 'ng-show' => "expanded" }
+  .menu{ 'ng-show' => "expanded" }
     .menu_items
       .menu_item{ "ng-repeat": "column in columns", "ng-click": "toggle(column);" }
         %input{ type: "checkbox", "ng-checked": "column.visible" }
         %span
           {{ column.name }}
       %hr
-      %div.menu_item.text-center
+      .menu_item.text-center
         %input.fullwidth.orange{ type: "button", "ng-value": "saved() ? 'Saved': 'Saving'", "ng-show": "saved() || saving", "ng-disabled": "saved()" }
         %input.fullwidth.red{ type: "button", value: t('admin.column_save_as_default').html_safe, "ng-show": "!saved() && !saving", "ng-click": "saveColumnPreferences(action)" }
diff --git a/app/assets/javascripts/templates/admin/modals/image_upload.html.haml b/app/assets/javascripts/templates/admin/modals/image_upload.html.haml
index ebc198b178..6d3580a0d2 100644
--- a/app/assets/javascripts/templates/admin/modals/image_upload.html.haml
+++ b/app/assets/javascripts/templates/admin/modals/image_upload.html.haml
@@ -2,7 +2,7 @@
   %i.fa.fa-times-circle{'aria-hidden' => "true"}
 
 %form#image_upload{ name: 'form', novalidate: true, enctype: 'multipart/form-data', multipart: true, "ng-controller": "ProductImageCtrl" }
-  %div.image-preview
+  .image-preview
     %img.spinner{ src: image_path("/spinning-circles.svg"), "ng-hide": "!imageUploader.isUploading" }
     %img.preview{ "ng-src": "{{imagePreview}}", "ng-class": "{'faded': imageUploader.isUploading}" }
 
diff --git a/app/assets/javascripts/templates/partials/contact.html.haml b/app/assets/javascripts/templates/partials/contact.html.haml
index c601f47fd7..fae59bfa07 100644
--- a/app/assets/javascripts/templates/partials/contact.html.haml
+++ b/app/assets/javascripts/templates/partials/contact.html.haml
@@ -1,5 +1,5 @@
-%div.contact-container
-  %div.modal-centered{"ng-if" => "::enterprise.email_address || enterprise.website || enterprise.phone || enterprise.whatsapp_phone"}
+.contact-container
+  .modal-centered{"ng-if" => "::enterprise.email_address || enterprise.website || enterprise.phone || enterprise.whatsapp_phone"}
     %p.modal-header {{'contact' | t}}
     %p{"ng-if" => "::enterprise.phone", "ng-bind" => "::enterprise.phone"}
 
diff --git a/app/assets/javascripts/templates/partials/follow.html.haml b/app/assets/javascripts/templates/partials/follow.html.haml
index 847dbac6b9..909aa7af05 100644
--- a/app/assets/javascripts/templates/partials/follow.html.haml
+++ b/app/assets/javascripts/templates/partials/follow.html.haml
@@ -1,4 +1,4 @@
-%div.modal-centered{ "ng-if" => "::enterprise.twitter || enterprise.facebook || enterprise.linkedin || enterprise.instagram"}
+.modal-centered{ "ng-if" => "::enterprise.twitter || enterprise.facebook || enterprise.linkedin || enterprise.instagram"}
   %p.modal-header {{'follow' | t}}
   .follow-icons
     %span{"ng-if" => "::enterprise.twitter"}
diff --git a/app/assets/javascripts/templates/partials/producer_details.html.haml b/app/assets/javascripts/templates/partials/producer_details.html.haml
index 814e55b241..bf1b33b574 100644
--- a/app/assets/javascripts/templates/partials/producer_details.html.haml
+++ b/app/assets/javascripts/templates/partials/producer_details.html.haml
@@ -7,7 +7,7 @@
       .columns.small-12.fat
         %div{"ng-if" => "::enterprise.name"}
           %label{"ng-bind-html" => "::'shop_for_products_html' | t:{enterprise: enterprise.name}"}
-        %div.show-for-medium-up{"ng-if" => "::!enterprise.name"}
+        .show-for-medium-up{"ng-if" => "::!enterprise.name"}
            
     .row
       .columns.small-12
diff --git a/app/components/multiple_checked_select_component/multiple_checked_select_component.html.haml b/app/components/multiple_checked_select_component/multiple_checked_select_component.html.haml
index c9c0abebec..d94ad43883 100644
--- a/app/components/multiple_checked_select_component/multiple_checked_select_component.html.haml
+++ b/app/components/multiple_checked_select_component/multiple_checked_select_component.html.haml
@@ -1,12 +1,12 @@
 .ofn-drop-down.ofn-drop-down-v2{ data: { controller: "multiple-checked-select" } }
-  %div.ofn-drop-down-label{ "data-multiple-checked-select-target": "button" }
+  .ofn-drop-down-label{ "data-multiple-checked-select-target": "button" }
     %span{class: "label"}= t('admin.columns')
     %span{ class: "icon-caret-down", "data-multiple-checked-select-target": "caret" }
-  %div.menu{ class: "hidden", "data-multiple-checked-select-target": "options" }
-    %div.filter
+  .menu{ class: "hidden", "data-multiple-checked-select-target": "options" }
+    .filter
       %input{ type: "text", "data-multiple-checked-select-target": "filter", placeholder: I18n.t('components.multiple_checked_select.filter_placeholder') }
     %hr
-    %div.menu_items
+    .menu_items
       - @options.each do |option|
         %label.menu_item{ "data-multiple-checked-select-target": "option", "data-value": option[1], "data-label": option[0] }
           %input{ type: "checkbox", checked: @selected.include?(option[1]), name: "#{@name}[]", value: option[1] }
diff --git a/app/views/admin/customers/index.html.haml b/app/views/admin/customers/index.html.haml
index ea65c31108..3ba03ca538 100644
--- a/app/views/admin/customers/index.html.haml
+++ b/app/views/admin/customers/index.html.haml
@@ -101,6 +101,6 @@
             %td.actions
               %a{ 'ng-click' => "deleteCustomer(customer)", :class => "delete-customer icon-trash no-text" }
 
-      %div.text-center{ "ng-show": "filteredCustomers.length > customerLimit" }
+      .text-center{ "ng-show": "filteredCustomers.length > customerLimit" }
         %input{ type: 'button', value: t(:show_more), "ng-click": 'customerLimit = customerLimit + 20' }
         %input{ type: 'button', value: t(:show_all_with_more, num: '{{ filteredCustomers.length - customerLimit }}'), "ng-click": 'customerLimit = filteredCustomers.length' }
diff --git a/app/views/admin/order_cycles/_loading_flash.html.haml b/app/views/admin/order_cycles/_loading_flash.html.haml
index 8d670b5d6e..9cdeb8d718 100644
--- a/app/views/admin/order_cycles/_loading_flash.html.haml
+++ b/app/views/admin/order_cycles/_loading_flash.html.haml
@@ -1,4 +1,4 @@
-%div.sixteen.columns.alpha.omega#loading{ "ng-cloak": true, "ng-if": 'RequestMonitor.loading' }
+.sixteen.columns.alpha.omega#loading{ "ng-cloak": true, "ng-if": 'RequestMonitor.loading' }
   = render partial: "components/admin_spinner"
   %h1{ "ng-hide": 'orderCycles.length > 0' }
     = t('.loading_order_cycles')
diff --git a/app/views/admin/order_cycles/checkout_options.html.haml b/app/views/admin/order_cycles/checkout_options.html.haml
index ac0fc1abf5..566a9c3ac0 100644
--- a/app/views/admin/order_cycles/checkout_options.html.haml
+++ b/app/views/admin/order_cycles/checkout_options.html.haml
@@ -79,12 +79,12 @@
                     = t('.no_payment_methods')
 
   %div#save-bar
-    %div.container
-      %div.seven.columns.alpha
+    .container
+      .seven.columns.alpha
         - if @order_cycle.errors.any?
           %h5#status-message.error
             = @order_cycle.errors.to_a.to_sentence
-      %div.nine.columns.omega.text-right
+      .nine.columns.omega.text-right
         = hidden_field_tag :context, :checkout_options
         = f.submit t('.save'), class: "red", name: :save
         = f.submit t('.save_and_back_to_list'), class: "red", name: :save_and_back_to_list
diff --git a/app/views/admin/order_cycles/edit.html.haml b/app/views/admin/order_cycles/edit.html.haml
index 39e3305b18..b477a567e8 100644
--- a/app/views/admin/order_cycles/edit.html.haml
+++ b/app/views/admin/order_cycles/edit.html.haml
@@ -33,7 +33,7 @@
     - else
       = render 'form', f: f
 
-    %div.warning-modal{ data: { controller: 'modal modal-link', 'modal-link-target-value': "linked-order-warning-modal" } }
+    .warning-modal{ data: { controller: 'modal modal-link', 'modal-link-target-value': "linked-order-warning-modal" } }
       %button.modal-target-trigger{ type: 'button', data: { 'action': 'modal-link#open' }, style: 'display: none;' } 
       = render ModalComponent.new(id: "linked-order-warning-modal", close_button: false) do
         .content.flex-column.gap-2
diff --git a/app/views/admin/order_cycles/index.html.haml b/app/views/admin/order_cycles/index.html.haml
index 9e593e9245..6700e62683 100644
--- a/app/views/admin/order_cycles/index.html.haml
+++ b/app/views/admin/order_cycles/index.html.haml
@@ -35,7 +35,7 @@
         = render 'admin/order_cycles/loading_flash'
         = render 'admin/order_cycles/show_more'
 
-        %div.warning-modal{ data: { controller: 'modal modal-link', 'modal-link-target-value': "linked-order-warning-modal" } }
+        .warning-modal{ data: { controller: 'modal modal-link', 'modal-link-target-value': "linked-order-warning-modal" } }
           %button.modal-target-trigger{ type: 'button', data: { 'action': 'modal-link#open' }, style: 'display: none;' } 
           = render ModalComponent.new(id: "linked-order-warning-modal", close_button: false) do
             .content.flex-column.gap-2
diff --git a/app/views/admin/product_import/_entries_table.html.haml b/app/views/admin/product_import/_entries_table.html.haml
index 09be2df666..9195ac0c5c 100644
--- a/app/views/admin/product_import/_entries_table.html.haml
+++ b/app/views/admin/product_import/_entries_table.html.haml
@@ -1,4 +1,4 @@
-%div.table-wrap
+.table-wrap
   %table
     %thead
       %th
diff --git a/app/views/admin/product_import/_errors_list.html.haml b/app/views/admin/product_import/_errors_list.html.haml
index 644f798bb1..2abef179f0 100644
--- a/app/views/admin/product_import/_errors_list.html.haml
+++ b/app/views/admin/product_import/_errors_list.html.haml
@@ -1,4 +1,4 @@
-%div.import-errors{ "ng-controller": 'ImportFeedbackCtrl', "ng-repeat": "(line_number, entry ) in (entries | entriesFilterValid:'invalid')" }
+.import-errors{ "ng-controller": 'ImportFeedbackCtrl', "ng-repeat": "(line_number, entry ) in (entries | entriesFilterValid:'invalid')" }
   %p.line
     %strong
       #{t('admin.product_import.import.item_line')} {{line_number}}:
diff --git a/app/views/admin/product_import/_import_options.html.haml b/app/views/admin/product_import/_import_options.html.haml
index 6e6144ffc9..ac460249d0 100644
--- a/app/views/admin/product_import/_import_options.html.haml
+++ b/app/views/admin/product_import/_import_options.html.haml
@@ -3,34 +3,34 @@
 
 - @importer.enterprises_index.each do |name, attrs|
   - if name and attrs[:id] and @importer.permission_by_id?(attrs[:id])
-    %div.panel-section.import-settings
-      %div.panel-header{ "ng-click": 'togglePanel()', "ng-class": '{active: active}' }
-        %div.header-icon.success
+    .panel-section.import-settings
+      .panel-header{ "ng-click": 'togglePanel()', "ng-class": '{active: active}' }
+        .header-icon.success
           %i.fa.fa-check-circle
-        %div.header-description
+        .header-description
           = name
   - elsif name and attrs[:id]
-    %div.panel-section.import-settings
-      %div.panel-header
-        %div.header-icon.error
+    .panel-section.import-settings
+      .panel-header
+        .header-icon.error
           %i.fa.fa-warning
-        %div.header-description
+        .header-description
           = name
           %span.header-error= " - #{t('admin.product_import.import.no_permission')}"
   - elsif name
-    %div.panel-section.import-settings
-      %div.panel-header
-        %div.header-icon.error
+    .panel-section.import-settings
+      .panel-header
+        .header-icon.error
           %i.fa.fa-warning
-        %div.header-description
+        .header-description
           = name
           %span.header-error= " - #{t('admin.product_import.import.not_found')}"
   - else
-    %div.panel-section.import-settings
-      %div.panel-header
-        %div.header-icon.error
+    .panel-section.import-settings
+      .panel-header
+        .header-icon.error
           %i.fa.fa-warning
-        %div.header-description
+        .header-description
           = t('admin.product_import.import.no_name')
           %span.header-error= " - #{t('admin.product_import.import.blank_enterprise')}"
 
diff --git a/app/views/admin/product_import/_import_review.html.haml b/app/views/admin/product_import/_import_review.html.haml
index c6ff771a60..21d3535418 100644
--- a/app/views/admin/product_import/_import_review.html.haml
+++ b/app/views/admin/product_import/_import_review.html.haml
@@ -9,101 +9,101 @@
       %em= @non_updatable_fields.keys.join(', ') + "."
       = t('.fields_ignored')
 
-  %div.panel-section{ "ng-controller": 'DropdownPanelsCtrl' }
-    %div.panel-header{ "ng-click": 'togglePanel()', "ng-class": '{active: active && count((entries | entriesFilterValid:"all"))}' }
-      %div.header-caret
+  .panel-section{ "ng-controller": 'DropdownPanelsCtrl' }
+    .panel-header{ "ng-click": 'togglePanel()', "ng-class": '{active: active && count((entries | entriesFilterValid:"all"))}' }
+      .header-caret
         %i{ "ng-class": "{'icon-chevron-down': active, 'icon-chevron-right': !active}", "ng-hide": 'count((entries | entriesFilterValid:"all")) == 0' }
-      %div.header-icon.success
+      .header-icon.success
         %i.fa.fa-info-circle.info
-      %div.header-count
+      .header-count
         %strong.item-count
           {{ count((entries | entriesFilterValid:"all")) }}
-      %div.header-description
+      .header-description
         = t('admin.product_import.import.entries_found')
-    %div.panel-content{ "ng-hide": '!active || count((entries | entriesFilterValid:"all")) == 0' }
+    .panel-content{ "ng-hide": '!active || count((entries | entriesFilterValid:"all")) == 0' }
       = render 'entries_table', entries: 'all'
 
-  %div.panel-section{ "ng-controller": 'DropdownPanelsCtrl', "ng-hide": 'count((entries | entriesFilterValid:"invalid")) == 0' }
-    %div.panel-header{ "ng-click": 'togglePanel()', "ng-class": '{active: active && count((entries | entriesFilterValid:"invalid"))}' }
-      %div.header-caret
+  .panel-section{ "ng-controller": 'DropdownPanelsCtrl', "ng-hide": 'count((entries | entriesFilterValid:"invalid")) == 0' }
+    .panel-header{ "ng-click": 'togglePanel()', "ng-class": '{active: active && count((entries | entriesFilterValid:"invalid"))}' }
+      .header-caret
         %i{ "ng-class": "{'icon-chevron-down': active, 'icon-chevron-right': !active}", "ng-hide": 'count((entries | entriesFilterValid:"invalid")) == 0' }
-      %div.header-icon.error
+      .header-icon.error
         %i.fa.fa-warning
-      %div.header-count
+      .header-count
         %strong.invalid-count
           {{ count((entries | entriesFilterValid:"invalid")) }}
-      %div.header-description
+      .header-description
         = t('admin.product_import.import.entries_with_errors')
-    %div.panel-content{ "ng-hide": '!active || count((entries | entriesFilterValid:"invalid")) == 0' }
+    .panel-content{ "ng-hide": '!active || count((entries | entriesFilterValid:"invalid")) == 0' }
       = render 'errors_list'
       %br
       = render 'entries_table', entries: 'invalid'
 
-  %div.panel-section{ "ng-controller": 'DropdownPanelsCtrl', "ng-hide": 'count((entries | entriesFilterValid:"create_product")) == 0' }
-    %div.panel-header{ "ng-click": 'togglePanel()', "ng-class": '{active: active && count((entries | entriesFilterValid:"create_product"))}' }
-      %div.header-caret
+  .panel-section{ "ng-controller": 'DropdownPanelsCtrl', "ng-hide": 'count((entries | entriesFilterValid:"create_product")) == 0' }
+    .panel-header{ "ng-click": 'togglePanel()', "ng-class": '{active: active && count((entries | entriesFilterValid:"create_product"))}' }
+      .header-caret
         %i{ "ng-class": "{'icon-chevron-down': active, 'icon-chevron-right': !active}", "ng-hide": 'count((entries | entriesFilterValid:"create_product")) == 0' }
-      %div.header-icon.success
+      .header-icon.success
         %i.fa.fa-check-circle
-      %div.header-count
+      .header-count
         %strong.create-count
           {{ count((entries | entriesFilterValid:"create_product")) }}
-      %div.header-description
+      .header-description
         = t('admin.product_import.import.products_to_create')
-    %div.panel-content{ "ng-hide": '!active || count((entries | entriesFilterValid:"create_product")) == 0' }
+    .panel-content{ "ng-hide": '!active || count((entries | entriesFilterValid:"create_product")) == 0' }
       = render 'entries_table', entries: 'create_product'
 
-  %div.panel-section{ "ng-controller": 'DropdownPanelsCtrl', "ng-hide": 'count((entries | entriesFilterValid:"update_product")) == 0' }
-    %div.panel-header{ "ng-click": 'togglePanel()', "ng-class": '{active: active && count((entries | entriesFilterValid:"update_product"))}' }
-      %div.header-caret
+  .panel-section{ "ng-controller": 'DropdownPanelsCtrl', "ng-hide": 'count((entries | entriesFilterValid:"update_product")) == 0' }
+    .panel-header{ "ng-click": 'togglePanel()', "ng-class": '{active: active && count((entries | entriesFilterValid:"update_product"))}' }
+      .header-caret
         %i{ "ng-class": "{'icon-chevron-down': active, 'icon-chevron-right': !active}", "ng-hide": 'count((entries | entriesFilterValid:"update_product")) == 0' }
-      %div.header-icon.success
+      .header-icon.success
         %i.fa.fa-check-circle
-      %div.header-count
+      .header-count
         %strong.update-count
           {{ count((entries | entriesFilterValid:"update_product")) }}
-      %div.header-description
+      .header-description
         = t('admin.product_import.import.products_to_update')
-    %div.panel-content{ "ng-hide": '!active || count((entries | entriesFilterValid:"update_product")) == 0' }
+    .panel-content{ "ng-hide": '!active || count((entries | entriesFilterValid:"update_product")) == 0' }
       = render 'entries_table', entries: 'update_product'
 
-  %div.panel-section{ "ng-controller": 'DropdownPanelsCtrl', "ng-hide": 'count((entries | entriesFilterValid:"create_inventory")) == 0' }
-    %div.panel-header{ "ng-click": 'togglePanel()', "ng-class": '{active: active && count((entries | entriesFilterValid:"create_inventory"))}' }
-      %div.header-caret
+  .panel-section{ "ng-controller": 'DropdownPanelsCtrl', "ng-hide": 'count((entries | entriesFilterValid:"create_inventory")) == 0' }
+    .panel-header{ "ng-click": 'togglePanel()', "ng-class": '{active: active && count((entries | entriesFilterValid:"create_inventory"))}' }
+      .header-caret
         %i{ "ng-class": "{'icon-chevron-down': active, 'icon-chevron-right': !active}", "ng-hide": 'count((entries | entriesFilterValid:"create_inventory")) == 0' }
-      %div.header-icon.success
+      .header-icon.success
         %i.fa.fa-check-circle
-      %div.header-count
+      .header-count
         %strong.inv-create-count
           {{ count((entries | entriesFilterValid:"create_inventory")) }}
-      %div.header-description
+      .header-description
         = t('admin.product_import.import.inventory_to_create')
-    %div.panel-content{ "ng-hide": '!active || count((entries | entriesFilterValid:"create_inventory")) == 0' }
+    .panel-content{ "ng-hide": '!active || count((entries | entriesFilterValid:"create_inventory")) == 0' }
       = render 'entries_table', entries: 'create_inventory'
 
-  %div.panel-section{ "ng-controller": 'DropdownPanelsCtrl', "ng-hide": 'count((entries | entriesFilterValid:"update_inventory")) == 0' }
-    %div.panel-header{ "ng-click": 'togglePanel()', "ng-class": '{active: active && count((entries | entriesFilterValid:"update_inventory"))}' }
-      %div.header-caret
+  .panel-section{ "ng-controller": 'DropdownPanelsCtrl', "ng-hide": 'count((entries | entriesFilterValid:"update_inventory")) == 0' }
+    .panel-header{ "ng-click": 'togglePanel()', "ng-class": '{active: active && count((entries | entriesFilterValid:"update_inventory"))}' }
+      .header-caret
         %i{ "ng-class": "{'icon-chevron-down': active, 'icon-chevron-right': !active}", "ng-hide": 'count((entries | entriesFilterValid:"update_inventory")) == 0' }
-      %div.header-icon.success
+      .header-icon.success
         %i.fa.fa-check-circle
-      %div.header-count
+      .header-count
         %strong.inv-update-count
           {{ count((entries | entriesFilterValid:"update_inventory")) }}
-      %div.header-description
+      .header-description
         = t('admin.product_import.import.inventory_to_update')
-    %div.panel-content{ "ng-hide": '!active || count((entries | entriesFilterValid:"update_inventory")) == 0' }
+    .panel-content{ "ng-hide": '!active || count((entries | entriesFilterValid:"update_inventory")) == 0' }
       = render 'entries_table', entries: 'update_inventory'
 
-  %div.panel-section{ "ng-controller": 'ImportOptionsFormCtrl', "ng-hide": 'resetTotal == 0' }
-    %div.panel-header
-      %div.header-caret
-      %div.header-icon.info
+  .panel-section{ "ng-controller": 'ImportOptionsFormCtrl', "ng-hide": 'resetTotal == 0' }
+    .panel-header
+      .header-caret
+      .header-icon.info
         %i.fa.fa-info-circle
-      %div.header-count
+      .header-count
         %strong.reset-count
           {{ resetTotal }}
-      %div.header-description
+      .header-description
         -if @import_into == 'inventories'
           = t('admin.product_import.import.inventory_to_reset')
         - else
diff --git a/app/views/admin/product_import/_save_results.html.haml b/app/views/admin/product_import/_save_results.html.haml
index 87af4141cf..772616bcfc 100644
--- a/app/views/admin/product_import/_save_results.html.haml
+++ b/app/views/admin/product_import/_save_results.html.haml
@@ -2,7 +2,7 @@
 %h5= t('.final_results')
 %br
 
-%div.post-save-results
+.post-save-results
 
   %p{ "ng-show": 'updates.products_created' }
     %i.fa{ "ng-class": "{'fa-info-circle': updates.products_created == 0, 'fa-check-circle': updates.products_created > 0}" }
diff --git a/app/views/admin/products_v3/_sort.html.haml b/app/views/admin/products_v3/_sort.html.haml
index 2b25644639..48e5637b45 100644
--- a/app/views/admin/products_v3/_sort.html.haml
+++ b/app/views/admin/products_v3/_sort.html.haml
@@ -1,5 +1,5 @@
 #sort
-  %div.pagination-description
+  .pagination-description
     - if pagy.present?
       = t(".pagination.products_total_html", count: pagy.count, from: pagy.from, to: pagy.to)
 
diff --git a/app/views/admin/products_v3/_variant_row.html.haml b/app/views/admin/products_v3/_variant_row.html.haml
index f32474e50e..d87763e42f 100644
--- a/app/views/admin/products_v3/_variant_row.html.haml
+++ b/app/views/admin/products_v3/_variant_row.html.haml
@@ -22,7 +22,7 @@
 %td.col-unit.field.popout{'data-controller': "popout", 'data-popout-update-display-value': "false"}
   = f.button :unit_to_display, class: "popout__button", 'aria-label': t('admin.products_page.columns.unit'), 'data-popout-target': "button" do
     = variant.unit_to_display # Show the generated summary of unit values
-  %div.popout__container{ style: 'display: none;', 'data-controller': 'toggle-control', 'data-popout-target': "dialog" }
+  .popout__container{ style: 'display: none;', 'data-controller': 'toggle-control', 'data-popout-target': "dialog" }
     .field
       -# Show a composite field for unit_value and unit_description
       = f.hidden_field :unit_value
@@ -39,7 +39,7 @@
 %td.col-on_hand.field.popout{'data-controller': "popout"}
   %button.popout__button{'data-popout-target': "button", 'aria-label': t('admin.products_page.columns.on_hand')}
     = variant.on_demand_desired_or_current ? t(:on_demand) : variant.on_hand_desired_or_current
-  %div.popout__container{ style: 'display: none;', 'data-controller': 'toggle-control', 'data-popout-target': "dialog" }
+  .popout__container{ style: 'display: none;', 'data-controller': 'toggle-control', 'data-popout-target': "dialog" }
     .field
       = f.number_field method_on_hand, min: 0, 'aria-label': t('admin.products_page.columns.on_hand'), 'data-toggle-control-target': 'control', disabled: f.object.on_demand_desired_or_current
       = error_message_on variant, method_on_hand
diff --git a/app/views/admin/shared/_views_dropdown.html.haml b/app/views/admin/shared/_views_dropdown.html.haml
index 8e1f299fa8..a215621271 100644
--- a/app/views/admin/shared/_views_dropdown.html.haml
+++ b/app/views/admin/shared/_views_dropdown.html.haml
@@ -1,7 +1,7 @@
 .ofn-drop-down#views-dropdown
   %span{ :class => 'icon-eye-open' }= "  #{t('admin.viewing', current_view_name: '{{ currentView().name }}')}".html_safe
   %span{ 'ng-class' => "expanded && 'icon-caret-up' || !expanded && 'icon-caret-down'" }
-  %div.menu{ 'ng-show' => "expanded" }
-    %div.menu_item{ "close-on-click": true, "ng-repeat": "(viewKey, view) in views", "toggle-view": true }
+  .menu{ 'ng-show' => "expanded" }
+    .menu_item{ "close-on-click": true, "ng-repeat": "(viewKey, view) in views", "toggle-view": true }
       %span.check
       %span.name {{ view.name }}
diff --git a/app/views/admin/subscriptions/_loading_flash.html.haml b/app/views/admin/subscriptions/_loading_flash.html.haml
index 2a53e71505..07aafe4ae5 100644
--- a/app/views/admin/subscriptions/_loading_flash.html.haml
+++ b/app/views/admin/subscriptions/_loading_flash.html.haml
@@ -1,4 +1,4 @@
-%div.sixteen.columns.alpha.omega#loading{ "ng-cloak": true, "ng-if": 'shop_id && RequestMonitor.loading' }
+.sixteen.columns.alpha.omega#loading{ "ng-cloak": true, "ng-if": 'shop_id && RequestMonitor.loading' }
   = render partial: "components/admin_spinner"
   %h1
     = t('.loading')
diff --git a/app/views/admin/subscriptions/_no_results.html.haml b/app/views/admin/subscriptions/_no_results.html.haml
index b7d461519b..efb7db136a 100644
--- a/app/views/admin/subscriptions/_no_results.html.haml
+++ b/app/views/admin/subscriptions/_no_results.html.haml
@@ -1,4 +1,4 @@
-%div.margin-top-30.text-center{ "ng-show": 'shop_id && !RequestMonitor.loading && filteredSubscriptions.length == 0' }
+.margin-top-30.text-center{ "ng-show": 'shop_id && !RequestMonitor.loading && filteredSubscriptions.length == 0' }
   .no-results{ "ng-show": '!filtersApplied()' }
     %h1.margin-bottom-20=t('.no_subscriptions')
     %span.text-big=t('.why_dont_you_add_one')
diff --git a/app/views/admin/subscriptions/index.html.haml b/app/views/admin/subscriptions/index.html.haml
index 7b48edb4b6..4cf3fead9f 100644
--- a/app/views/admin/subscriptions/index.html.haml
+++ b/app/views/admin/subscriptions/index.html.haml
@@ -15,7 +15,7 @@
 = render 'data'
 = render 'order_update_issues_dialog'
 
-%div.margin-bottom-50{ "ng-controller": 'SubscriptionsController' }
+.margin-bottom-50{ "ng-controller": 'SubscriptionsController' }
   %save-bar{ dirty: "false", persist: "false" }
   = render 'filters'
   = render 'controls'
diff --git a/app/views/admin/variant_overrides/_loading_flash.html.haml b/app/views/admin/variant_overrides/_loading_flash.html.haml
index 5765159f61..339d107766 100644
--- a/app/views/admin/variant_overrides/_loading_flash.html.haml
+++ b/app/views/admin/variant_overrides/_loading_flash.html.haml
@@ -1,4 +1,4 @@
-%div.sixteen.columns.alpha.omega#loading{ "ng-cloak": true, "ng-if": 'hub_id && products.length == 0 && RequestMonitor.loading' }
+.sixteen.columns.alpha.omega#loading{ "ng-cloak": true, "ng-if": 'hub_id && products.length == 0 && RequestMonitor.loading' }
   = render partial: "components/admin_spinner"
   %h1
     = t('.loading_inventory')
diff --git a/app/views/admin/variant_overrides/_no_results.html.haml b/app/views/admin/variant_overrides/_no_results.html.haml
index 274424b32a..71040f97a3 100644
--- a/app/views/admin/variant_overrides/_no_results.html.haml
+++ b/app/views/admin/variant_overrides/_no_results.html.haml
@@ -1,4 +1,4 @@
-%div.text-big.no-results{ "ng-show": 'hub_id && products.length > 0 && filteredProducts.length == 0' }
+.text-big.no-results{ "ng-show": 'hub_id && products.length > 0 && filteredProducts.length == 0' }
   %span{ "ng-show": 'views.inventory.visible && !filtersApplied()' }=t('admin.variant_overrides.index.currently_empty')
   %span{ "ng-show": 'views.inventory.visible && filtersApplied()' }=t('admin.variant_overrides.index.no_matching_products')
   %span{ "ng-show": 'views.hidden.visible && !filtersApplied()' }=t('admin.variant_overrides.index.no_hidden_products')
diff --git a/app/views/checkout/_details.html.haml b/app/views/checkout/_details.html.haml
index 56146d19c0..73cb4435c2 100644
--- a/app/views/checkout/_details.html.haml
+++ b/app/views/checkout/_details.html.haml
@@ -1,54 +1,54 @@
 = form_with url: checkout_update_path(checkout_step), model: @order, method: :put, data: { remote: "true" } do |f|
   .medium-6
     = f.fields :bill_address, model: @order.bill_address do |bill_address|
-      %div.checkout-substep
+      .checkout-substep
         -# YOUR DETAILS
-        %div.checkout-title
+        .checkout-title
           = t("checkout.step1.contact_information.title")
 
         .two-columns-inputs
-          %div.checkout-input.with-floating-label{ "data-controller": "floating-label" }
+          .checkout-input.with-floating-label{ "data-controller": "floating-label" }
             = f.label :email, t("checkout.step1.contact_information.email.label")
             = f.text_field :email, { placeholder: " " }
             = f.error_message_on :email
 
-          %div.checkout-input.with-floating-label{ "data-controller": "floating-label" }
+          .checkout-input.with-floating-label{ "data-controller": "floating-label" }
             = bill_address.label :phone, t("checkout.step1.contact_information.phone.label")
             = bill_address.text_field :phone, { placeholder: " " }
             = f.error_message_on "bill_address.phone"
 
-      %div.checkout-substep
+      .checkout-substep
         -# BILLING ADDRESS
-        %div.checkout-title
+        .checkout-title
           = t("checkout.step1.billing_address.title")
 
         .two-columns-inputs
-          %div.checkout-input.with-floating-label{ "data-controller": "floating-label" }
+          .checkout-input.with-floating-label{ "data-controller": "floating-label" }
             = bill_address.label :firstname, t("checkout.step1.billing_address.first_name.label")
             = bill_address.text_field :firstname, { placeholder: " " }
             = f.error_message_on "bill_address.firstname"
 
-          %div.checkout-input.with-floating-label{ "data-controller": "floating-label" }
+          .checkout-input.with-floating-label{ "data-controller": "floating-label" }
             = bill_address.label :lastname, t("checkout.step1.billing_address.last_name.label")
             = bill_address.text_field :lastname, { placeholder: " " }
             = f.error_message_on "bill_address.lastname"
 
-        %div.checkout-input.with-floating-label{ "data-controller": "floating-label"}
+        .checkout-input.with-floating-label{ "data-controller": "floating-label"}
           = bill_address.label :address1, t("checkout.step1.address.address1.label")
           = bill_address.text_field :address1, { placeholder: " " }
           = f.error_message_on "bill_address.address1"
 
-        %div.checkout-input.with-floating-label{ "data-controller": "floating-label"}
+        .checkout-input.with-floating-label{ "data-controller": "floating-label"}
           = bill_address.label :address2, t("checkout.step1.address.address2.label")
           = bill_address.text_field :address2, { placeholder: " " }
           = f.error_message_on "bill_address.address2"
 
-        %div.checkout-input.with-floating-label{ "data-controller": "floating-label"}
+        .checkout-input.with-floating-label{ "data-controller": "floating-label"}
           = bill_address.label :city, t("checkout.step1.address.city.label")
           = bill_address.text_field :city, { placeholder: " " }
           = f.error_message_on "bill_address.city"
 
-        %div.checkout-input.with-floating-label{ "data-controller": "floating-label"}
+        .checkout-input.with-floating-label{ "data-controller": "floating-label"}
           = bill_address.label :zipcode, t("checkout.step1.address.zipcode.label")
           = bill_address.text_field :zipcode, { placeholder: " " }
           = f.error_message_on "bill_address.zipcode"
@@ -56,22 +56,22 @@
         %div{ "data-controller": "dependent-select", "data-dependent-select-options-value": countries_with_states }
           - bill_address_country = @order.bill_address.country || DefaultCountry.country
 
-          %div.checkout-input
+          .checkout-input
             = bill_address.label :country_id, t("checkout.step1.address.country_id.label")
             = bill_address.select :country_id, countries, { selected: bill_address_country.id }, { "data-dependent-select-target": "source", "data-action": "dependent-select#handleSelectChange" }
 
-          %div.checkout-input
+          .checkout-input
             = bill_address.label :state_id, t("checkout.step1.address.state_id.label")
             = bill_address.select :state_id, states_for_country(bill_address_country), { selected: @order.bill_address&.state_id }, { "data-dependent-select-target": "select" }
 
         - if spree_current_user
-          %div.checkout-input
+          .checkout-input
             = f.check_box :save_bill_address
             = f.label :save_bill_address, t(:checkout_default_bill_address)
 
-    %div.checkout-substep{ "data-controller": "toggle-control shippingmethod" }
+    .checkout-substep{ "data-controller": "toggle-control shippingmethod" }
       - selected_shipping_method = @order.shipping_method&.id || params[:shipping_method_id]
-      %div.checkout-title
+      .checkout-title
         = t("checkout.step1.shipping_info.title")
 
       - display_ship_address = false
@@ -80,7 +80,7 @@
       - selected_shipping_method ||= @shipping_methods[0].id if @shipping_methods.length == 1
       - @shipping_methods.each do |shipping_method|
         - ship_method_is_selected = shipping_method.id == selected_shipping_method.to_i
-        %div.checkout-input.checkout-input-radio
+        .checkout-input.checkout-input-radio
           = fields_for shipping_method do |shipping_method_form|
             = shipping_method_form.radio_button :name, shipping_method.id,
               id: "shipping_method_#{shipping_method.id}",
@@ -92,35 +92,35 @@
             = shipping_method_form.label shipping_method.id, shipping_method.name, {for: "shipping_method_" + shipping_method.id.to_s }
             %em.fees= payment_or_shipping_price(shipping_method, @order)
             - display_ship_address = display_ship_address || (ship_method_is_selected && shipping_method.require_ship_address)
-        %div.checkout-input{"data-shippingmethod-target": "shippingMethodDescription", "data-shippingmethodid": shipping_method.id , style: "display: #{ship_method_is_selected ? 'block' : 'none'}" }
+        .checkout-input{"data-shippingmethod-target": "shippingMethodDescription", "data-shippingmethodid": shipping_method.id , style: "display: #{ship_method_is_selected ? 'block' : 'none'}" }
           #distributor_address.panel
             - if shipping_method.description.present?
               = simple_format(html_escape(shipping_method.description))
 
       = f.error_message_on :shipping_method, standalone: true
 
-      %div.checkout-input{ "data-toggle-control-target": "content", style: "display: #{display_ship_address ? 'block' : 'none'}" }
+      .checkout-input{ "data-toggle-control-target": "content", style: "display: #{display_ship_address ? 'block' : 'none'}" }
         = f.check_box :ship_address_same_as_billing, { id: "ship_address_same_as_billing", name: "ship_address_same_as_billing", "data-action": "shippingmethod#showHideShippingAddress", "data-shippingmethod-target": "shippingAddressCheckbox", checked: shipping_and_billing_match?(@order) }, 1, nil
         = f.label :ship_address_same_as_billing, t(:checkout_address_same), { for: "ship_address_same_as_billing" }
 
       %div{"data-shippingmethod-target": "shippingMethodAddress", style: "display: #{!display_ship_address || shipping_and_billing_match?(@order) ? 'none' : 'block'}" }
         = f.fields :ship_address, model: @order.ship_address do |ship_address|
-          %div.checkout-input.with-floating-label{ "data-controller": "floating-label"}
+          .checkout-input.with-floating-label{ "data-controller": "floating-label"}
             = ship_address.label :address1, t("checkout.step1.address.address1.label")
             = ship_address.text_field :address1, { placeholder: " " }
             = f.error_message_on "ship_address.address1"
 
-          %div.checkout-input.with-floating-label{ "data-controller": "floating-label"}
+          .checkout-input.with-floating-label{ "data-controller": "floating-label"}
             = ship_address.label :address2, t("checkout.step1.address.address2.label")
             = ship_address.text_field :address2, { placeholder: " " }
             = f.error_message_on "ship_address.address2"
 
-          %div.checkout-input.with-floating-label{ "data-controller": "floating-label"}
+          .checkout-input.with-floating-label{ "data-controller": "floating-label"}
             = ship_address.label :city, t("checkout.step1.address.city.label")
             = ship_address.text_field :city, { placeholder: " " }
             = f.error_message_on "ship_address.city"
 
-          %div.checkout-input.with-floating-label{ "data-controller": "floating-label"}
+          .checkout-input.with-floating-label{ "data-controller": "floating-label"}
             = ship_address.label :zipcode, t("checkout.step1.address.zipcode.label")
             = ship_address.text_field :zipcode, { placeholder: " " }
             = f.error_message_on "ship_address.zipcode"
@@ -128,16 +128,16 @@
           %div{ "data-controller": "dependent-select", "data-dependent-select-options-value": countries_with_states }
             - ship_address_country = @order.ship_address.country || DefaultCountry.country
 
-            %div.checkout-input
+            .checkout-input
               = ship_address.label :country_id, t("checkout.step1.address.country_id.label")
               = ship_address.select :country_id, countries, { selected: ship_address_country.id }, { "data-dependent-select-target": "source", "data-action": "dependent-select#handleSelectChange" }
 
-            %div.checkout-input
+            .checkout-input
               = ship_address.label :state_id, t("checkout.step1.address.state_id.label")
               = ship_address.select :state_id, states_for_country(ship_address_country), { selected: @order.ship_address&.state_id }, { "data-dependent-select-target": "select" }
 
       - if spree_current_user
-        %div.checkout-input{ "data-toggle-control-target": "content", style: "display: #{display_ship_address ? 'block' : 'none'}" }
+        .checkout-input{ "data-toggle-control-target": "content", style: "display: #{display_ship_address ? 'block' : 'none'}" }
           = f.check_box :save_ship_address
           = f.label :save_ship_address, t(:checkout_default_ship_address)
 
@@ -145,7 +145,7 @@
         = f.label :special_instructions, t(:checkout_instructions)
         = f.text_area :special_instructions, size: "60x4"
 
-    %div.checkout-submit
+    .checkout-submit
       = f.submit t("checkout.step1.submit"), class: "button primary", disabled: @terms_and_conditions_accepted == false || @platform_tos_accepted == false
       %a.button.cancel{href: main_app.cart_path}
         = t("checkout.step1.cancel")
diff --git a/app/views/checkout/_form.html.haml b/app/views/checkout/_form.html.haml
index 649806a85a..61417f5e0c 100644
--- a/app/views/checkout/_form.html.haml
+++ b/app/views/checkout/_form.html.haml
@@ -1,5 +1,5 @@
 - content_for :injection_data do
   = inject_saved_credit_cards
 
-%div.checkout-step{ class: "#{'checkout-summary' if checkout_step?(:summary)}" }
+.checkout-step{ class: "#{'checkout-summary' if checkout_step?(:summary)}" }
   = render "checkout/#{checkout_step}"
diff --git a/app/views/checkout/_guest.html.haml b/app/views/checkout/_guest.html.haml
index 8c57697a34..fe6f0b3be5 100644
--- a/app/views/checkout/_guest.html.haml
+++ b/app/views/checkout/_guest.html.haml
@@ -1,10 +1,10 @@
 %checkout.row#checkout
   .small-12.medium-12.columns
     .checkout-step
-      %div.checkout-guest-title
+      .checkout-guest-title
         = t :checkout_headline
 
-      %div.checkout-submit{ class: "#{@order.distributor.allow_guest_orders? ? 'checkout-submit-inline' : 'medium-6' }" }
+      .checkout-submit{ class: "#{@order.distributor.allow_guest_orders? ? 'checkout-submit-inline' : 'medium-6' }" }
         %button.button.primary{ "data-action": "click->guest-checkout#login" }
           = t :label_login
         -if @order.distributor.allow_guest_orders?
diff --git a/app/views/checkout/_payment.html.haml b/app/views/checkout/_payment.html.haml
index bb4e3f1ad3..7d7761f560 100644
--- a/app/views/checkout/_payment.html.haml
+++ b/app/views/checkout/_payment.html.haml
@@ -1,11 +1,11 @@
 .medium-6#checkout-payment-methods
   - if @order.distributor.vouchers.present? || @order.distributor.connected_apps.vine.present?
-    %div.checkout-substep
+    .checkout-substep
       = render partial: "checkout/voucher_section", locals: { order: @order, voucher_adjustment: @order.voucher_adjustments.first }
 
   = form_with url: checkout_update_path(local_assigns[:step] || checkout_step), model: @order, method: :put, data: { remote: "true" } do |f|
-    %div.checkout-substep{"data-controller": "paymentmethod"}
-      %div.checkout-title
+    .checkout-substep{"data-controller": "paymentmethod"}
+      .checkout-title
         = t("checkout.step2.payment_method.title")
 
       - if @order.zero_priced_order?
@@ -15,7 +15,7 @@
         - selected_payment_method = @order.payments&.with_state(:checkout)&.first&.payment_method_id
         - selected_payment_method ||= available_payment_methods[0].id if available_payment_methods.length == 1
         - available_payment_methods.each do |payment_method|
-          %div.checkout-input.checkout-input-radio
+          .checkout-input.checkout-input-radio
             = f.radio_button :payment_method_id, payment_method.id,
               id: "payment_method_#{payment_method.id}",
               name: "order[payments_attributes][][payment_method_id]",
@@ -35,10 +35,10 @@
 
         = f.error_message_on :payment_method, standalone: true
 
-    %div.checkout-substep
+    .checkout-substep
       = t("checkout.step2.explaination")
 
-    %div.checkout-submit
+    .checkout-submit
       = f.submit t("checkout.step2.submit"), class: "button primary", disabled: @terms_and_conditions_accepted == false || @platform_tos_accepted == false
       %a.button.cancel{href: main_app.checkout_step_path(:details)}
         = t("checkout.step2.cancel")
diff --git a/app/views/checkout/_summary.html.haml b/app/views/checkout/_summary.html.haml
index 682f02639e..364a1f2570 100644
--- a/app/views/checkout/_summary.html.haml
+++ b/app/views/checkout/_summary.html.haml
@@ -71,8 +71,8 @@
               = payment_method&.description
 
 
-    %div.checkout-substep
-      %div.checkout-title
+    .checkout-substep
+      .checkout-title
         = t("checkout.step3.order.title")
         %a.summary-edit{ href: main_app.cart_path, data: { action: "guest-checkout#removeUnloadEvent" } }
           = t("checkout.step3.order.edit")
diff --git a/app/views/checkout/_tabs.html.haml b/app/views/checkout/_tabs.html.haml
index 705543243f..e4c027c895 100644
--- a/app/views/checkout/_tabs.html.haml
+++ b/app/views/checkout/_tabs.html.haml
@@ -1,19 +1,19 @@
-%div.flex
-  %div.columns.three.text-center.checkout-tab{"class": [("selected" if checkout_step?(:details)), ("success" unless checkout_step?(:details))]}
+.flex
+  .columns.three.text-center.checkout-tab{"class": [("selected" if checkout_step?(:details)), ("success" unless checkout_step?(:details))]}
     %div
       %span.checkout-tab-number
         1 -
       %span.checkout-tab-label
         = link_to_unless checkout_step?(:details), t("checkout.your_details_without_number"), main_app.checkout_step_path(:details) do
           = t("checkout.your_details_without_number")
-  %div.columns.three.text-center.checkout-tab{"class": [("selected" if checkout_step?(:payment)), ("success" if checkout_step?(:summary))]}
+  .columns.three.text-center.checkout-tab{"class": [("selected" if checkout_step?(:payment)), ("success" if checkout_step?(:summary))]}
     %div
       %span.checkout-tab-number
         2 -
       %span.checkout-tab-label
         = link_to_if checkout_step?(:summary), t("checkout.payment_method_without_number"), main_app.checkout_step_path(:payment) do
           = t("checkout.payment_method_without_number")
-  %div.columns.three.text-center.checkout-tab{"class": ("selected" if checkout_step?(:summary))}
+  .columns.three.text-center.checkout-tab{"class": ("selected" if checkout_step?(:summary))}
     %div
       %span.checkout-tab-number
         3 -
diff --git a/app/views/checkout/_terms_and_conditions.html.haml b/app/views/checkout/_terms_and_conditions.html.haml
index 06b2f125ed..803c81cad6 100644
--- a/app/views/checkout/_terms_and_conditions.html.haml
+++ b/app/views/checkout/_terms_and_conditions.html.haml
@@ -1,5 +1,5 @@
-%div.checkout-substep
-  %div.checkout-input
+.checkout-substep
+  .checkout-input
     - if platform_terms_required? && distributor_terms_required?
       = f.check_box :accept_terms, { name: "accept_terms", checked: all_terms_and_conditions_already_accepted? }, 1, nil
       = f.label :accept_terms do
diff --git a/app/views/checkout/_voucher_section.html.haml b/app/views/checkout/_voucher_section.html.haml
index 0f7fb12f53..ab75648579 100644
--- a/app/views/checkout/_voucher_section.html.haml
+++ b/app/views/checkout/_voucher_section.html.haml
@@ -17,9 +17,9 @@
                 = t("checkout.step2.voucher.warning_forfeit_remaining_amount")
       - else
         .two-columns-inputs
-          %div.checkout-input
+          .checkout-input
             = form.text_field :voucher_code, value: params.dig(:order, :voucher_code), data: { action: "input->toggle-control#enableIfPresent" }, placeholder: t("checkout.step2.voucher.placeholder"), class: "voucher"
             = form.error_message_on :voucher_code
 
-          %div.checkout-input
+          .checkout-input
             = form.submit t("checkout.step2.voucher.apply"), disabled: true, class: "button cancel voucher-button", "data-disable-with": false, data: { "toggle-control-target": "control" }
diff --git a/app/views/checkout/payment/_stripe_sca.html.haml b/app/views/checkout/payment/_stripe_sca.html.haml
index 0f91940ff1..e9cd15b34a 100644
--- a/app/views/checkout/payment/_stripe_sca.html.haml
+++ b/app/views/checkout/payment/_stripe_sca.html.haml
@@ -24,9 +24,9 @@
           = hidden_field_tag "order[payments_attributes][][source_attributes][cc_type]", nil, { "data-stripe-target": "brand" }
           = hidden_field_tag "order[payments_attributes][][source_attributes][last_digits]", nil, { "data-stripe-target": "last4" }
           = hidden_field_tag "order[payments_attributes][][source_attributes][gateway_payment_profile_id]", nil, { "data-stripe-target": "pmId" }
-          %div.card-element{ "data-stripe-target": "cardElement" }
+          .card-element{ "data-stripe-target": "cardElement" }
 
-        %div.error.card-errors{ "data-stripe-target": "cardErrors" }
+        .error.card-errors{ "data-stripe-target": "cardErrors" }
 
     - if spree_current_user
       .checkout-input
diff --git a/app/views/groups/_contact.html.haml b/app/views/groups/_contact.html.haml
index 5c1e3aef5e..22d60d1855 100644
--- a/app/views/groups/_contact.html.haml
+++ b/app/views/groups/_contact.html.haml
@@ -1,6 +1,6 @@
-%div.contact-container
+.contact-container
   - if @group.email.present? || @group.website.present? || @group.phone.present?
-    %div.modal-centered
+    .modal-centered
       %p.modal-header
         = t :groups_contact_web
       - if @group.phone.present?
@@ -18,7 +18,7 @@
 
 %div
   - if @group.facebook.present? || @group.twitter.present? || @group.linkedin.present? || @group.instagram.present?
-    %div.modal-centered.pad-top
+    .modal-centered.pad-top
       %p.modal-header
         = t :groups_contact_web
       .follow-icons
@@ -33,7 +33,7 @@
 
 %div
   - if @group.address1.present? || @group.city.present?
-    %div.modal-centered.pad-top
+    .modal-centered.pad-top
       %p.modal-header
         = t :groups_contact_web
       %p
diff --git a/app/views/producers/_fat.html.haml b/app/views/producers/_fat.html.haml
index 202f761266..bf580f4b06 100644
--- a/app/views/producers/_fat.html.haml
+++ b/app/views/producers/_fat.html.haml
@@ -11,7 +11,7 @@
           = t :producers_about
         %img.right.show-for-medium-up{"ng-src" => "{{::producer.logo}}" }
         %p.text-small{ "ng-bind" => "::producer.description"}
-      %div.show-for-medium-up{"ng-if" => "::producer.description.length==0"}
+      .show-for-medium-up{"ng-if" => "::producer.description.length==0"}
         %label  
         %img.right.show-for-medium-up{"ng-src" => "{{::producer.logo}}" }
 
@@ -28,7 +28,7 @@
             %span.fat-properties{"ng-repeat" => "property in producer.supplied_properties"}
               %span{"ng-bind" => "property.presentation"}
 
-      %div.show-for-medium-up{"ng-if" => "producer.supplied_taxons.length==0"}
+      .show-for-medium-up{"ng-if" => "producer.supplied_taxons.length==0"}
          
 
       %div{"ng-if" => "::producer.email_address || producer.website || producer.phone"}
@@ -79,7 +79,7 @@
           %div{"ng-if" => "::producer.name"}
             %label
               = t :producers_buy_at_html, enterprise: '<span class="turquoise" ng-bind="::producer.name"></span>'.html_safe
-          %div.show-for-medium-up{"ng-if" => "::!producer.name"}
+          .show-for-medium-up{"ng-if" => "::!producer.name"}
             &nbsp;
       .row.cta-container
         .columns.small-12
diff --git a/app/views/shared/menu/_cart_sidebar.html.haml b/app/views/shared/menu/_cart_sidebar.html.haml
index 16c057888f..d741faec88 100644
--- a/app/views/shared/menu/_cart_sidebar.html.haml
+++ b/app/views/shared/menu/_cart_sidebar.html.haml
@@ -50,7 +50,7 @@
           = t 'total'
           {{ Cart.total()  | localizeCurrency }}
 
-      %div.fullwidth
+      .fullwidth
         %a.edit-cart.button.large.dark.left{href: main_app.cart_path, "ng-disabled" => "Cart.dirty || Cart.empty()", "ng-class" => "{ dirty: Cart.dirty }"}
           %div{ "ng-if": "Cart.dirty" }= t(:cart_updating)
           %div{ "ng-if": "!Cart.dirty && Cart.empty()" }= t(:cart_empty)
diff --git a/app/views/shop/products/_form.html.haml b/app/views/shop/products/_form.html.haml
index 9d2679abc2..6663f4fda3 100644
--- a/app/views/shop/products/_form.html.haml
+++ b/app/views/shop/products/_form.html.haml
@@ -11,7 +11,7 @@
             .medium-12.large-9.columns.full
               = render partial: "shop/products/search_feedback"
 
-              %div.pad-top{ "infinite-scroll" => "loadMore()", "infinite-scroll-distance" => "1", "infinite-scroll-disabled" => 'Products.loading', "infinite-scroll-immediate-check": "false" }
+              .pad-top{ "infinite-scroll" => "loadMore()", "infinite-scroll-distance" => "1", "infinite-scroll-disabled" => 'Products.loading', "infinite-scroll-immediate-check": "false" }
                 %product.animate-repeat{"ng-controller" => "ProductNodeCtrl", "ng-repeat" => "product in Products.products track by product.id", "id" => "product-{{ product.id }}"}
                   = render "shop/products/summary"
                   .shop-variants
diff --git a/app/views/shop/products/_search_feedback.haml b/app/views/shop/products/_search_feedback.haml
index d0511135d8..05aa2c25a2 100644
--- a/app/views/shop/products/_search_feedback.haml
+++ b/app/views/shop/products/_search_feedback.haml
@@ -15,7 +15,7 @@
                 {{ query }}
             = render partial: 'shop/products/applied_filters_feedback'
 
-        %div.no-results-bar{"ng-show" => "Products.products.length == 0 && !Products.loading"}
+        .no-results-bar{"ng-show" => "Products.products.length == 0 && !Products.loading"}
           .row.summary
             .small-12.columns
               %p.no-results
diff --git a/app/views/shop/products/_searchbar.haml b/app/views/shop/products/_searchbar.haml
index d1f2b65879..f069c0bd6a 100644
--- a/app/views/shop/products/_searchbar.haml
+++ b/app/views/shop/products/_searchbar.haml
@@ -2,7 +2,7 @@
   .shop-searchbar
     .row
       .small-12.large-5.columns.flex
-        %div.search-wrap
+        .search-wrap
           %input#search.text{"ng-model" => "query",
                 type: 'search',
                 placeholder: t(:products_search),
diff --git a/app/views/shopping_shared/tabs/_contact.html.haml b/app/views/shopping_shared/tabs/_contact.html.haml
index f2f5b7a70c..de78ddcfd1 100644
--- a/app/views/shopping_shared/tabs/_contact.html.haml
+++ b/app/views/shopping_shared/tabs/_contact.html.haml
@@ -2,7 +2,7 @@
   .row
     .small-12.large-4.columns
       - if current_distributor.address.address1 || current_distributor.address.address2 || current_distributor.address.city || current_distributor.address.state || current_distributor.address.zipcode
-        %div.center
+        .center
           .header
             = t :shopping_contact_address
           %span= current_distributor.name
@@ -18,7 +18,7 @@
 
     .small-12.large-4.columns
       - if current_distributor.website || current_distributor.email_address || current_distributor.phone || current_distributor.whatsapp_phone
-        %div.center
+        .center
           .header
             = t :shopping_contact_web
           %p
@@ -41,10 +41,10 @@
 
     .small-12.large-4.columns
       - if current_distributor.twitter.present? || current_distributor.facebook.present? || current_distributor.linkedin.present? || current_distributor.instagram.present?
-        %div.center
+        .center
           .header
             = t :shopping_contact_social
-          %div.follow-icons
+          .follow-icons
             - if current_distributor.twitter.present?
               %span
                 %a{href: "http://twitter.com/#{current_distributor.twitter}", target: "_blank" }
diff --git a/app/views/shops/_fat.html.haml b/app/views/shops/_fat.html.haml
index 17a86258de..e5985b81ef 100644
--- a/app/views/shops/_fat.html.haml
+++ b/app/views/shops/_fat.html.haml
@@ -15,7 +15,7 @@
           %div
             %span.fat-properties{"ng-repeat" => "property in hub.distributed_properties"}
               %span{"ng-bind" => "property.presentation"}
-      %div.show-for-medium-up{"ng-if" => "::hub.taxons.length==0"}
+      .show-for-medium-up{"ng-if" => "::hub.taxons.length==0"}
         &nbsp;
     .columns.small-12.medium-3.large-2.fat{"ng-show" => "open() && !shopfront_loading"}
       %div{"ng-if" => "::(hub.pickup || hub.delivery)"}
@@ -50,5 +50,5 @@
               .less
                 = t :label_less
 
-      %div.show-for-medium-up{"ng-if" => "::hub.producers.length==0"}
+      .show-for-medium-up{"ng-if" => "::hub.producers.length==0"}
         &nbsp;
diff --git a/app/views/spree/admin/mail_methods/_form.html.haml b/app/views/spree/admin/mail_methods/_form.html.haml
index b3faab8e9c..f399d7f3bd 100644
--- a/app/views/spree/admin/mail_methods/_form.html.haml
+++ b/app/views/spree/admin/mail_methods/_form.html.haml
@@ -1,7 +1,7 @@
 %div
   .row
     %fieldset.no-border-bottom
-      %div.notice
+      .notice
         = t('spree.mail_settings_notice_html')
       %legend{align: "center"}= t("spree.general")
       .field
diff --git a/app/views/spree/admin/orders/_bulk_actions.html.haml b/app/views/spree/admin/orders/_bulk_actions.html.haml
index 74c032ed55..72e86aba91 100644
--- a/app/views/spree/admin/orders/_bulk_actions.html.haml
+++ b/app/views/spree/admin/orders/_bulk_actions.html.haml
@@ -3,22 +3,22 @@
     %span{ "data-controller": "checked-feedback", "data-checked-feedback-translation-value": "spree.admin.orders.index.selected" }
       = t("spree.admin.orders.index.selected", count: 0)
 
-  %div.plain.ofn-drop-down.disabled{ "data-checked-target": "disable" }
+  .plain.ofn-drop-down.disabled{ "data-checked-target": "disable" }
     %details{"data-controller": "dropdown"}
       %summary
         %span.icon-reorder
           ="#{t('admin.actions')}".html_safe
-      %div.menu{"data-action": "click->dropdown#closeOnMenu"}
-        %div.menu_item
+      .menu{"data-action": "click->dropdown#closeOnMenu"}
+        .menu_item
           %span.name{ "data-controller": "modal-link", "data-action": "click->modal-link#open", "data-modal-link-target-value": "resend_confirmation" }
             = t('spree.admin.orders.index.resend_confirmation')
         - if Spree::Config[:enable_invoices?]
-          %div.menu_item
+          .menu_item
             %span.name{ "data-controller": "modal-link", "data-action": "click->modal-link#open", "data-modal-link-target-value": "send_invoice" }
               = t('spree.admin.orders.index.send_invoice')
-          %div.menu_item
+          .menu_item
             %span.name{ "data-controller": "bulk-actions", "data-action": "click->bulk-actions#perform", "data-bulk-actions-reflex-value": "Admin::Orders#bulk_invoice" }
               = t('spree.admin.orders.index.print_invoices')
-        %div.menu_item
+        .menu_item
           %span.name{ "data-controller": "modal-link", "data-action": "click->modal-link#open", "data-modal-link-target-value": "cancel_orders" }
             = t('spree.admin.orders.index.cancel_orders')
diff --git a/app/views/spree/admin/orders/_filters.html.haml b/app/views/spree/admin/orders/_filters.html.haml
index fcf14a4441..130e8a2c48 100644
--- a/app/views/spree/admin/orders/_filters.html.haml
+++ b/app/views/spree/admin/orders/_filters.html.haml
@@ -1,4 +1,4 @@
-%div.admin-orders-index-search{ "data-controller": "search", "data-search-restore-value": @stored_query }
+.admin-orders-index-search{ "data-controller": "search", "data-search-restore-value": @stored_query }
   = form_with url: spree.admin_orders_url, id: "orders_form", method: :get, data: { remote: true, "search-target": "form" } do
     = hidden_field_tag :page, 1, class: "page"
     = hidden_field_tag :per_page, 15, class: "per-page"
diff --git a/app/views/spree/admin/orders/_form.html.haml b/app/views/spree/admin/orders/_form.html.haml
index 02b1acf841..79b86cbbfe 100644
--- a/app/views/spree/admin/orders/_form.html.haml
+++ b/app/views/spree/admin/orders/_form.html.haml
@@ -1,4 +1,4 @@
-%div.admin-order-form-fields
+.admin-order-form-fields
   - if @line_item.try(:errors).present?
     = render :partial => 'spree/shared/error_messages', :locals => { :target => @line_item }
 
diff --git a/app/views/spree/admin/orders/_insufficient_stock_lines.html.haml b/app/views/spree/admin/orders/_insufficient_stock_lines.html.haml
index 70a4ac14ce..eaab7b303c 100644
--- a/app/views/spree/admin/orders/_insufficient_stock_lines.html.haml
+++ b/app/views/spree/admin/orders/_insufficient_stock_lines.html.haml
@@ -1,4 +1,4 @@
-%div.insufficient-stock-items
+.insufficient-stock-items
   %fieldset.no-border-bottom
     %legend
       = t("spree.orders.line_item.out_of_stock")
diff --git a/app/views/spree/admin/orders/_shipment.html.haml b/app/views/spree/admin/orders/_shipment.html.haml
index 599900c295..a992fe38fd 100644
--- a/app/views/spree/admin/orders/_shipment.html.haml
+++ b/app/views/spree/admin/orders/_shipment.html.haml
@@ -39,7 +39,7 @@
       - if shipment.can_modify?
         %tr.edit-method.hidden.total
           %td{ :colspan => "5" }
-            %div.field.alpha.five.columns
+            .field.alpha.five.columns
               = label_tag 'selected_shipping_rate_id', Spree.t(:shipping_method)
               = select_tag :selected_shipping_rate_id, options_for_select(shipment.shipping_rates.map { |sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id), { :class => 'select2 fullwidth', :data => { 'shipment-number' => shipment.number } }
 
diff --git a/app/views/spree/admin/orders/_table_row.html.haml b/app/views/spree/admin/orders/_table_row.html.haml
index 4027bcf6da..fd202f76d7 100644
--- a/app/views/spree/admin/orders/_table_row.html.haml
+++ b/app/views/spree/admin/orders/_table_row.html.haml
@@ -42,7 +42,7 @@
     %span
       = order.display_total
   %td.actions
-    %div.row-loading-icons
+    .row-loading-icons
       - if local_assigns[:success]
         %i.success.icon-ok-sign{"data-controller": "ephemeral"}
     = render AdminTooltipComponent.new(text: t('spree.admin.orders.index.edit'), link_text: "", link: edit_admin_order_path(order), link_class: "icon_link with-tip icon-edit no-text")
diff --git a/app/views/spree/admin/orders/bulk/_invoice_modal.html.haml b/app/views/spree/admin/orders/bulk/_invoice_modal.html.haml
index 50ec9f75df..9a4d541f19 100644
--- a/app/views/spree/admin/orders/bulk/_invoice_modal.html.haml
+++ b/app/views/spree/admin/orders/bulk/_invoice_modal.html.haml
@@ -1,7 +1,7 @@
 %div{ id: "bulk_invoices_modal", "data-controller": "modal file-loading", "data-modal-instant-value": true, "data-action": "keyup@document->modal#closeIfEscapeKey" }
   .reveal-modal-bg.fade{ "data-modal-target": "background", "data-action": "click->modal#remove" }
   .reveal-modal.fade.tiny.modal-component{ "data-modal-target": "modal" }
-    %div.fullwidth.align-center
+    .fullwidth.align-center
       %h4.modal-title
         = t('js.admin.orders.index.compiling_invoices')
         %br
@@ -13,5 +13,5 @@
           %br
           %p= t('js.admin.orders.index.please_wait')
           %br
-        %div.hidden{ 'data-file-loading-target': "loaded" }
+        .hidden{ 'data-file-loading-target': "loaded" }
           = render partial: "spree/admin/orders/bulk/invoice_link", locals: { invoice_url: }
diff --git a/app/views/spree/admin/orders/bulk_management.html.haml b/app/views/spree/admin/orders/bulk_management.html.haml
index f4b57f832f..6ba7728ab8 100644
--- a/app/views/spree/admin/orders/bulk_management.html.haml
+++ b/app/views/spree/admin/orders/bulk_management.html.haml
@@ -60,7 +60,7 @@
 
   %hr.divider.sixteen.columns.alpha.omega{ "ng-show": 'unitsVariantSelected()' }
 
-  %div.sixteen.columns.alpha.omega#group_buy_calculation{ "ng-show": 'unitsVariantSelected()', "ng-cloak": true }
+  .sixteen.columns.alpha.omega#group_buy_calculation{ "ng-show": 'unitsVariantSelected()', "ng-cloak": true }
     .one.columns.alpha
     .shared_resource.four.columns.alpha
       %input{ type: 'checkbox', :id => 'shared_resource', 'ng-model' => 'sharedResource'}
@@ -116,7 +116,7 @@
         = render partial: 'admin/shared/angular_per_page_controls', locals: { position: "right", model: "line_items" }
  
 
-  %div.sixteen.columns.alpha#loading{ 'ng-if' => 'RequestMonitor.loading' }
+  .sixteen.columns.alpha#loading{ 'ng-if' => 'RequestMonitor.loading' }
     = render partial: "components/admin_spinner"
     %h1
       = t("admin.orders.bulk_management.loading")
diff --git a/app/views/spree/admin/orders/edit.html.haml b/app/views/spree/admin/orders/edit.html.haml
index eb10841bbc..d1d0dc73a9 100644
--- a/app/views/spree/admin/orders/edit.html.haml
+++ b/app/views/spree/admin/orders/edit.html.haml
@@ -28,5 +28,5 @@
       .no-objects-found
         = Spree.t(:your_order_is_empty_add_product)
 
-    %div.admin-order-edit-form
+    .admin-order-edit-form
       = render partial: 'form'
diff --git a/app/views/spree/admin/orders/invoice4.html.haml b/app/views/spree/admin/orders/invoice4.html.haml
index f05a463b88..6a5c22ac8b 100644
--- a/app/views/spree/admin/orders/invoice4.html.haml
+++ b/app/views/spree/admin/orders/invoice4.html.haml
@@ -101,5 +101,5 @@
 - if @order.note.present?
   = render partial: 'spree/admin/orders/_invoice/order_note'
 
-%div.text-center
+.text-center
   = link_to_platform_terms
\ No newline at end of file
diff --git a/app/views/spree/admin/overview/_enterprises.html.haml b/app/views/spree/admin/overview/_enterprises.html.haml
index bef20ba29c..11f0eb54eb 100644
--- a/app/views/spree/admin/overview/_enterprises.html.haml
+++ b/app/views/spree/admin/overview/_enterprises.html.haml
@@ -1,8 +1,8 @@
-%div.dashboard_item.sixteen.columns.alpha#enterprises
+.dashboard_item.sixteen.columns.alpha#enterprises
   = render 'enterprises_header'
 
   - if @enterprises.empty?
-    %div.sixteen.columns.alpha.list-item.warning
+    .sixteen.columns.alpha.list-item.warning
       %span.text.fifteen.columns.alpha
         = t "spree_admin_enterprises_none_text"
       %span.one.columns.omega
@@ -12,7 +12,7 @@
       %span.icon-arrow-right
 
   - else
-    %div.sixteen.columns.alpha.list-title
+    .sixteen.columns.alpha.list-title
       %span.five.columns.alpha
         = t "spree_admin_enterprises_hubs_name"
       - if can? :admin, Spree::PaymentMethod
@@ -24,7 +24,7 @@
       - if can? :admin, EnterpriseFee
         %span.centered.three.columns
           = t "spree_admin_enterprises_fees"
-    %div.sixteen.columns.alpha.list
+    .sixteen.columns.alpha.list
       = render partial: 'enterprise_row', collection: @enterprises, as: :enterprise
 
     %a.sixteen.columns.alpha.button.bottom{ href: "#{main_app.admin_enterprises_path}" }
diff --git a/app/views/spree/admin/overview/_enterprises_header.html.haml b/app/views/spree/admin/overview/_enterprises_header.html.haml
index 760043dcfa..0753d79803 100644
--- a/app/views/spree/admin/overview/_enterprises_header.html.haml
+++ b/app/views/spree/admin/overview/_enterprises_header.html.haml
@@ -1,4 +1,4 @@
-%div.header.sixteen.columns.alpha{ :class => "#{@enterprises.count > 0 ? "" : "warning"}"}
+.header.sixteen.columns.alpha{ :class => "#{@enterprises.count > 0 ? "" : "warning"}"}
   %h3.thirteen.columns.alpha
     = t "spree_admin_overview_enterprises_header"
   - if @enterprises.any?
diff --git a/app/views/spree/admin/overview/_order_cycles.html.haml b/app/views/spree/admin/overview/_order_cycles.html.haml
index 642f28ce33..c6b26b46ae 100644
--- a/app/views/spree/admin/overview/_order_cycles.html.haml
+++ b/app/views/spree/admin/overview/_order_cycles.html.haml
@@ -1,7 +1,7 @@
 - color_class = "warning" unless @order_cycle_count.positive?
 - icon_class = @order_cycle_count.positive? ? "icon-ok-sign" : "icon-warning-sign"
-%div.dashboard_item.seven.columns.omega#order_cycles
-  %div.header.sixteen.columns.alpha{class: color_class}
+.dashboard_item.seven.columns.omega#order_cycles
+  .header.sixteen.columns.alpha{class: color_class}
     %h3.ten.columns.alpha
       = t ".order_cycles"
     - if @order_cycle_count.positive?
@@ -10,8 +10,8 @@
     - else
       %a{ "ofn-with-tip" => t(".order_cycles_tip") }
         = t "admin.whats_this"
-  %div.sixteen.columns.alpha.list
-    %div.sixteen.columns.alpha.list-item{class: color_class}
+  .sixteen.columns.alpha.list
+    .sixteen.columns.alpha.list-item{class: color_class}
       %span.thirteen.columns.alpha
         = t(".you_have_active", count: @order_cycle_count)
       %span.three.columns.omega
diff --git a/app/views/spree/admin/overview/_products.html.haml b/app/views/spree/admin/overview/_products.html.haml
index 3f86329664..b5668a6764 100644
--- a/app/views/spree/admin/overview/_products.html.haml
+++ b/app/views/spree/admin/overview/_products.html.haml
@@ -1,7 +1,7 @@
 - color_class = "warning" unless @product_count.positive?
 - icon_class = @product_count.positive? ? "icon-ok-sign" : "icon-remove-sign"
-%div.dashboard_item.seven.columns.alpha#products
-  %div.header.sixteen.columns.alpha{class: color_class}
+.dashboard_item.seven.columns.alpha#products
+  .header.sixteen.columns.alpha{class: color_class}
     %h3.ten.columns.alpha
       = t "products"
     - if @product_count.positive?
@@ -10,8 +10,8 @@
     - else
       %a{ "ofn-with-tip" => t(".products_tip") }
         = t "admin.whats_this"
-  %div.sixteen.columns.alpha.list
-    %div.sixteen.columns.alpha.list-item{class: color_class}
+  .sixteen.columns.alpha.list
+    .sixteen.columns.alpha.list-item{class: color_class}
       %span.thirteen.columns.alpha
         = t(".active_products", count: @product_count)
       %span.three.columns.omega
diff --git a/app/views/spree/admin/overview/multi_enterprise_dashboard.html.haml b/app/views/spree/admin/overview/multi_enterprise_dashboard.html.haml
index bc997ca13a..ff4341bc32 100644
--- a/app/views/spree/admin/overview/multi_enterprise_dashboard.html.haml
+++ b/app/views/spree/admin/overview/multi_enterprise_dashboard.html.haml
@@ -14,7 +14,7 @@
     - if can? :admin, Spree::Product
       = render partial: "products"
 
-      %div.two.columns
+      .two.columns
         &nbsp;
 
     - if can? :admin, OrderCycle
diff --git a/app/views/spree/admin/products/_form.html.haml b/app/views/spree/admin/products/_form.html.haml
index ab9843b7e2..5e1bc422e4 100644
--- a/app/views/spree/admin/products/_form.html.haml
+++ b/app/views/spree/admin/products/_form.html.haml
@@ -1,4 +1,4 @@
-%div.admin-product-form-fields
+.admin-product-form-fields
   .left.sixteen.columns.alpha
     = f.field_container :name do
       = f.label :name, raw(t(:name) + content_tag(:span, ' *', :class => 'required'))
diff --git a/app/views/spree/admin/products/index/_indicators.html.haml b/app/views/spree/admin/products/index/_indicators.html.haml
index 54ea6041ea..2907c04074 100644
--- a/app/views/spree/admin/products/index/_indicators.html.haml
+++ b/app/views/spree/admin/products/index/_indicators.html.haml
@@ -1,12 +1,12 @@
-%div.sixteen.columns.alpha#loading{ 'ng-if' => 'RequestMonitor.loading' }
+.sixteen.columns.alpha#loading{ 'ng-if' => 'RequestMonitor.loading' }
   = render partial: "components/admin_spinner"
   %h1
     = t('.title')
 
-%div.sixteen.columns.alpha{ 'ng-show' => '!RequestMonitor.loading && products.length == 0 && q.query.length == 0' }
+.sixteen.columns.alpha{ 'ng-show' => '!RequestMonitor.loading && products.length == 0 && q.query.length == 0' }
   %h1#no_results= t('.no_products')
 
-%div.sixteen.columns.alpha{ 'ng-show' => '!RequestMonitor.loading && products.length == 0 && q.query.length != 0' }
+.sixteen.columns.alpha{ 'ng-show' => '!RequestMonitor.loading && products.length == 0 && q.query.length != 0' }
   %h1#no_results
     = t('.no_results')
     '
diff --git a/app/views/spree/admin/products/index/_products.html.haml b/app/views/spree/admin/products/index/_products.html.haml
index 58b1c4133e..032c783e7f 100644
--- a/app/views/spree/admin/products/index/_products.html.haml
+++ b/app/views/spree/admin/products/index/_products.html.haml
@@ -1,4 +1,4 @@
-%div.sixteen.columns.alpha{ 'ng-hide' => 'RequestMonitor.loading || products.length == 0' }
+.sixteen.columns.alpha{ 'ng-hide' => 'RequestMonitor.loading || products.length == 0' }
   %form{ name: 'bulk_product_form', autocomplete: "off" }
     %save-bar{ dirty: "bulk_product_form.$dirty", persist: "false" }
       %input.red{ type: "button", value: t(:save_changes), "ng-click": "submitProducts()", "ng-disabled": "!bulk_product_form.$dirty" }
diff --git a/app/views/spree/admin/products/index/_save_button_row.html.haml b/app/views/spree/admin/products/index/_save_button_row.html.haml
index 8f241753e7..8818bf84b3 100644
--- a/app/views/spree/admin/products/index/_save_button_row.html.haml
+++ b/app/views/spree/admin/products/index/_save_button_row.html.haml
@@ -1,3 +1,3 @@
-%div.sixteen.columns.alpha{ 'ng-hide' => 'RequestMonitor.loading || products.length == 0', style: "margin-bottom: 10px" }
-  %div.four.columns.alpha
+.sixteen.columns.alpha{ 'ng-hide' => 'RequestMonitor.loading || products.length == 0', style: "margin-bottom: 10px" }
+  .four.columns.alpha
     %input.four.columns.alpha{ :type => 'button', :value => t(:save_changes), 'ng-click' => 'submitProducts()'}
diff --git a/app/views/spree/admin/shared/_order_links.html.haml b/app/views/spree/admin/shared/_order_links.html.haml
index a79cf3b2f5..f18390073b 100644
--- a/app/views/spree/admin/shared/_order_links.html.haml
+++ b/app/views/spree/admin/shared/_order_links.html.haml
@@ -5,7 +5,7 @@
         %span
           %i.icon-check
           = I18n.t 'admin.actions'
-      %div.menu{"data-action": "click->dropdown#closeOnMenu"}
+      .menu{"data-action": "click->dropdown#closeOnMenu"}
         - order_links(@order).each do |link|
           - if link[:name] == t(:ship_order)
             %a.menu_item{ href: link[:url], target: link[:target] || "_self", data: { "modal-link-target-value": dom_id(@order, :ship), "action":  "click->modal-link#open", "controller": "modal-link" } }
diff --git a/app/views/spree/admin/variants/_form.html.haml b/app/views/spree/admin/variants/_form.html.haml
index 25adcabac3..e6bd51d12d 100644
--- a/app/views/spree/admin/variants/_form.html.haml
+++ b/app/views/spree/admin/variants/_form.html.haml
@@ -31,7 +31,7 @@
         = content_tag(:span, ' *', class: 'required')
       = f.button :unit_to_display, class: "popout__button", 'aria-label': t('.unit'), 'data-popout-target': "button" do
         = @variant.unit_to_display # Show the generated summary of unit values
-      %div.popout__container{ style: 'display: none;', 'data-controller': 'toggle-control', 'data-popout-target': "dialog" }
+      .popout__container{ style: 'display: none;', 'data-controller': 'toggle-control', 'data-popout-target': "dialog" }
         .field
           -# Show a composite field for unit_value and unit_description
           = f.hidden_field :unit_value
diff --git a/app/views/spree/orders/_bought.html.haml b/app/views/spree/orders/_bought.html.haml
index 5d80edbb05..ed96d2fe00 100644
--- a/app/views/spree/orders/_bought.html.haml
+++ b/app/views/spree/orders/_bought.html.haml
@@ -15,7 +15,7 @@
     %tr.bought.line-item{ class: "line-item-#{line_item.id} variant-#{variant.id}", "ng-show": 'showBought' }
       %td.cart-item-description
 
-        %div.item-thumb-image
+        .item-thumb-image
           = render 'spree/shared/variant_thumbnail', variant: variant
 
         = render 'spree/shared/line_item_name', line_item: line_item
diff --git a/app/views/spree/orders/_line_item.html.haml b/app/views/spree/orders/_line_item.html.haml
index 9d430e50a1..14aac9d689 100644
--- a/app/views/spree/orders/_line_item.html.haml
+++ b/app/views/spree/orders/_line_item.html.haml
@@ -3,7 +3,7 @@
   %tr.line-item{class: "variant-#{variant.id}"}
     %td.cart-item-description
 
-      %div.item-thumb-image
+      .item-thumb-image
         = render 'spree/shared/variant_thumbnail', variant: variant
 
       = render 'spree/shared/line_item_name', line_item: line_item
diff --git a/app/views/spree/orders/_summary.html.haml b/app/views/spree/orders/_summary.html.haml
index e27d51df05..7acccd287f 100644
--- a/app/views/spree/orders/_summary.html.haml
+++ b/app/views/spree/orders/_summary.html.haml
@@ -16,7 +16,7 @@
     - order.line_items.sorted_by_name_and_unit_value.each do |item|
       %tr.line_item{ class: "variant-#{item.variant.id}" }
         %td
-          %div.item-thumb-image
+          .item-thumb-image
             = render 'spree/shared/variant_thumbnail', variant: item.variant
 
           = render 'spree/shared/line_item_name', line_item: item
diff --git a/app/views/spree/orders/edit.html.haml b/app/views/spree/orders/edit.html.haml
index 30811833b9..5b59ca8f10 100644
--- a/app/views/spree/orders/edit.html.haml
+++ b/app/views/spree/orders/edit.html.haml
@@ -25,7 +25,7 @@
 
   #cart-container
     - if @order.line_items.empty?
-      %div.row
+      .row
         %p= t(:cart_empty)
         %p= link_to t(:orders_edit_continue), current_shop_products_path, :class => 'button continue'