spree_backend 2.2.1 → 2.2.2

data/app/views/spree/admin/properties/index.html.erb

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <li id="new_property_link">
-    <%= button_link_to Spree.t(:new_property), new_admin_property_url, { :remote => true, :icon => 'icon-plus', 'data-update' => 'new_property', :id => 'new_property_link' } %>
+    <%= button_link_to Spree.t(:new_property), new_admin_property_url, { :remote => true, :icon => 'plus', 'data-update' => 'new_property', :id => 'new_property_link' } %>
   </li>
 <% end %>
 

data/app/views/spree/admin/prototypes/_prototypes.html.erb

@@ -14,7 +14,7 @@
       <tr id="row_<%= prototype.id %>" data-hook="available_row" class="<%= cycle('odd', 'even')%>">
         <td><%= prototype.name %></td>
         <td class="actions">
-          <%= link_to Spree.t(:select), select_admin_prototype_url(prototype), :class => 'ajax button select_properties_from_prototype icon-ok' %>
+          <%= link_to Spree.t(:select), select_admin_prototype_url(prototype), :class => 'ajax button select_properties_from_prototype fa fa-check' %>
         </td>
       </tr>
     <% end %>

data/app/views/spree/admin/prototypes/edit.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_prototypes_list), spree.admin_prototypes_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_prototypes_list), spree.admin_prototypes_path, :icon => 'arrow-left' %>
   </li>
 <% end %>
 

data/app/views/spree/admin/prototypes/index.html.erb

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <li id="new_prototype_link">
-    <%= button_link_to Spree.t(:new_prototype), new_admin_prototype_url, {:remote => true, :icon => 'icon-plus', 'data-update' => 'new_prototype', :id => 'new_prototype_link'} %>
+    <%= button_link_to Spree.t(:new_prototype), new_admin_prototype_url, {:remote => true, :icon => 'plus', 'data-update' => 'new_prototype', :id => 'new_prototype_link'} %>
   </li>
 <% end %>
 

data/app/views/spree/admin/reports/sales_total.html.erb

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= link_to_with_icon 'icon-arrow-left', Spree.t(:back_to_reports_list), spree.admin_reports_url, :class => 'button' %></li>
+  <li><%= link_to_with_icon 'arrow-left', Spree.t(:back_to_reports_list), spree.admin_reports_url, :class => 'button' %></li>
 <% end %>
 
 

data/app/views/spree/admin/return_authorizations/edit.html.erb

@@ -1,12 +1,12 @@
 <% content_for :page_actions do %>
   <li>
     <% if @return_authorization.can_receive? %>
-      <%= button_link_to Spree.t(:receive), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'receive'), :method => :put, :data => { :confirm => Spree.t(:are_you_sure) }, :icon => 'icon-download-alt' %>
+      <%= button_link_to Spree.t(:receive), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'receive'), :method => :put, :data => { :confirm => Spree.t(:are_you_sure) }, :icon => 'download-alt' %>
     <% end %>
   </li>
   <li>
     <% if @return_authorization.can_cancel? %>
-      <%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'cancel'), :method => :put, :data => { :confirm => Spree.t(:are_you_sure) }, :icon => 'icon-remove' %>
+      <%= button_link_to Spree.t('actions.cancel'), fire_admin_order_return_authorization_url(@order, @return_authorization, :e => 'cancel'), :method => :put, :data => { :confirm => Spree.t(:are_you_sure) }, :icon => 'remove' %>
     <% end %>
   </li>
 <% end %>
@@ -14,7 +14,7 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
 
 <% content_for :page_title do %>
-  <i class="icon-arrow-right"></i> <%= Spree.t(:return_authorization) %> <%= @return_authorization.number %> (<%= Spree.t(@return_authorization.state.downcase) %>)
+  <i class="fa fa-arrow-right"></i> <%= Spree.t(:return_authorization) %> <%= @return_authorization.number %> (<%= Spree.t(@return_authorization.state.downcase) %>)
 <% end %>
 
 
@@ -24,9 +24,9 @@
     <%= render :partial => 'form', :locals => { :f => f } %>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t('actions.update'), 'icon-repeat' %>
+      <%= button Spree.t('actions.update'), 'repeat' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order), :icon => 'icon-remove' %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order), :icon => 'remove' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/return_authorizations/index.html.erb

@@ -3,14 +3,14 @@
 <% content_for :page_actions do %>
   <% if @order.shipments.any? &:shipped? %>
     <li>
-      <%= button_link_to Spree.t(:new_return_authorization), new_admin_order_return_authorization_url(@order), :icon => 'icon-plus' %>
+      <%= button_link_to Spree.t(:new_return_authorization), new_admin_order_return_authorization_url(@order), :icon => 'plus' %>
     </li>
   <% end %>
-  <li><%= button_link_to Spree.t(:back_to_orders_list), spree.admin_orders_path, :icon => 'icon-arrow-left' %></li>
+  <li><%= button_link_to Spree.t(:back_to_orders_list), spree.admin_orders_path, :icon => 'arrow-left' %></li>
 <% end %>
 
 <% content_for :page_title do %>
-  <i class="icon-arrow-right"></i> <%= Spree.t(:return_authorizations) %>
+  <i class="fa fa-arrow-right"></i> <%= Spree.t(:return_authorizations) %>
 <% end %>
 
 <% if @order.shipments.any?(&:shipped?) || @order.return_authorizations.any? %>
@@ -49,4 +49,4 @@
   </div>
 <% end %>
 
-<%= button_link_to Spree.t(:continue), admin_orders_url, :icon => 'icon-arrow-right' %>
+<%= button_link_to Spree.t(:continue), admin_orders_url, :icon => 'arrow-right' %>

data/app/views/spree/admin/return_authorizations/new.html.erb

@@ -1,11 +1,11 @@
 <%= render :partial => 'spree/admin/shared/order_tabs', :locals => { :current => 'Return Authorizations' } %>
 
 <% content_for :page_title do %>
-  <i class="icon-arrow-right"></i> <%= Spree.t(:new_return_authorization) %>
+  <i class="fa fa-arrow-right"></i> <%= Spree.t(:new_return_authorization) %>
 <% end %>
 
 <% content_for :page_actions do %>
-  <li><%= button_link_to Spree.t(:back_to_return_authorizations_list), spree.admin_order_return_authorizations_url, :icon => 'icon-arrow-left' %></li>
+  <li><%= button_link_to Spree.t(:back_to_return_authorizations_list), spree.admin_order_return_authorizations_url, :icon => 'arrow-left' %></li>
 <% end %>
 
 <%= render :partial => 'spree/shared/error_messages', :locals => { :target => @return_authorization } %>
@@ -14,9 +14,9 @@
     <%= render :partial => 'form', :locals => { :f => f } %>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:continue), 'icon-arrow-right' %>
+      <%= button Spree.t(:continue), 'arrow-right' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order), :icon => 'icon-remove' %>
+      <%= button_link_to Spree.t('actions.cancel'), admin_order_return_authorizations_url(@order), :icon => 'remove' %>
     </div>
   </fieldset>
 <% end %>

data/app/views/spree/admin/shared/_edit_resource_links.html.erb

@@ -1,5 +1,5 @@
 <div class="form-buttons filter-actions actions" data-hook="buttons">
-  <%= button Spree.t('actions.update'), 'icon-refresh' %>
+  <%= button Spree.t('actions.update'), 'refresh' %>
   <span class="or"><%= Spree.t(:or) %></span>
-  <%= button_link_to Spree.t('actions.cancel'), collection_url, :icon => 'icon-remove' %>
+  <%= button_link_to Spree.t('actions.cancel'), collection_url, :icon => 'remove' %>
 </div>

data/app/views/spree/admin/shared/_new_resource_links.html.erb

@@ -1,5 +1,5 @@
 <div class="form-buttons filter-actions actions" data-hook="buttons">
-  <%= button Spree.t('actions.create'), 'icon-ok' %>
+  <%= button Spree.t('actions.create'), 'ok' %>
   <span class="or"><%= Spree.t(:or) %></span>
-  <%= link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), collection_url, :class => 'button' %>
+  <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), collection_url, :class => 'button' %>
 </div>

data/app/views/spree/admin/shared/_order_submenu.html.erb

@@ -2,32 +2,32 @@
   <ul data-hook="admin_order_tabs">
     <% if can? :update, @order %>
       <li<%== ' class="active"' if current == 'Order Details' %>>
-        <%= link_to_with_icon 'icon-edit', Spree.t(:order_details), edit_admin_order_url(@order) %>
+        <%= link_to_with_icon 'edit', Spree.t(:order_details), edit_admin_order_url(@order) %>
       </li>
     <% end %>
 
     <% if can?(:update, @order) && checkout_steps.include?("address") %>
       <li<%== ' class="active"' if current == 'Customer Details' %>>
-        <%= link_to_with_icon 'icon-user', Spree.t(:customer_details), admin_order_customer_url(@order) %>
+        <%= link_to_with_icon 'user', Spree.t(:customer_details), admin_order_customer_url(@order) %>
       </li>
     <% end %>
 
     <% if can? :index, Spree::Adjustment %>
       <li<%== ' class="active"' if current == 'Adjustments' %>>
-        <%= link_to_with_icon 'icon-cogs', Spree.t(:adjustments), admin_order_adjustments_url(@order) %>
+        <%= link_to_with_icon 'cogs', Spree.t(:adjustments), admin_order_adjustments_url(@order) %>
       </li>
     <% end %>
 
     <% if can?(:index, Spree::Payment) %>
       <li<%== ' class="active"' if current == 'Payments' %>>
-        <%= link_to_with_icon 'icon-credit-card', Spree.t(:payments), admin_order_payments_url(@order) %>
+        <%= link_to_with_icon 'credit-card', Spree.t(:payments), admin_order_payments_url(@order) %>
       </li>
     <% end %>
 
     <% if can? :index, Spree::ReturnAuthorization %>
       <% if @order.completed? %>
         <li<%== ' class="active"' if current == 'Return Authorizations' %>>
-          <%= link_to_with_icon 'icon-share-alt', Spree.t(:return_authorizations), admin_order_return_authorizations_url(@order) %>
+          <%= link_to_with_icon 'share', Spree.t(:return_authorizations), admin_order_return_authorizations_url(@order) %>
         </li>
       <% end %>
     <% end %>

data/app/views/spree/admin/shared/_product_tabs.html.erb

@@ -10,19 +10,19 @@
   <nav class="menu">
     <ul data-hook="admin_product_tabs">
       <%= content_tag :li, :class => ('active' if current == 'Product Details') do %>
-        <%= link_to_with_icon 'icon-edit', Spree.t(:product_details), edit_admin_product_url(@product) %>
+        <%= link_to_with_icon 'edit', Spree.t(:product_details), edit_admin_product_url(@product) %>
       <% end if can?(:admin, Spree::Product) %>
       <%= content_tag :li, :class => ('active' if current == 'Images') do %>
-        <%= link_to_with_icon 'icon-picture', Spree.t(:images), admin_product_images_url(@product) %>
+        <%= link_to_with_icon 'picture', Spree.t(:images), admin_product_images_url(@product) %>
       <% end if can?(:admin, Spree::Image) %>
       <%= content_tag :li, :class => ('active' if current == 'Variants') do %>
-        <%= link_to_with_icon 'icon-th-large', Spree.t(:variants),  admin_product_variants_url(@product) %>
+        <%= link_to_with_icon 'th-large', Spree.t(:variants),  admin_product_variants_url(@product) %>
       <% end if can?(:admin, Spree::Variant) %>
       <%= content_tag :li, :class => ('active' if current == 'Product Properties') do %>
-        <%= link_to_with_icon 'icon-tasks', Spree.t(:product_properties), admin_product_product_properties_url(@product) %>
+        <%= link_to_with_icon 'tasks', Spree.t(:product_properties), admin_product_product_properties_url(@product) %>
       <% end if can?(:admin, Spree::ProductProperty) %>
       <%= content_tag :li, :class => ('active' if current == 'Stock Management') do %>
-        <%= link_to_with_icon 'icon-tasks', Spree.t(:stock_management), stock_admin_product_url(@product) %>
+        <%= link_to_with_icon 'tasks', Spree.t(:stock_management), stock_admin_product_url(@product) %>
       <% end if can?(:stock, Spree::Product) %>
       </li>
     </ul>

data/app/views/spree/admin/shared/_report_criteria.html.erb

@@ -4,7 +4,7 @@
         <%= s.text_field :created_at_gt, :class => 'datepicker datepicker-from', :value => datepicker_field_value(params[:q][:created_at_gt]) %>
         
         <span class="range-divider">
-          <i class="icon-arrow-right"></i>
+          <i class="fa fa-arrow-right"></i>
         </span>
 
         <%= s.text_field :created_at_lt, :class => 'datepicker datepicker-to', :value => datepicker_field_value(params[:q][:created_at_lt]) %>
@@ -12,6 +12,6 @@
     </div>
 
     <div class="actions filter-actions">
-      <%= button Spree.t(:search), 'icon-search'  %>
+      <%= button Spree.t(:search), 'search'  %>
     </div>
 <% end %>

data/app/views/spree/admin/shared/_report_order_criteria.html.erb

@@ -4,7 +4,7 @@
         <%= s.text_field :completed_at_gt, :class => 'datepicker datepicker-from', :value => datepicker_field_value(params[:q][:completed_at_gt]) %>
         
         <span class="range-divider">
-          <i class="icon-arrow-right"></i>
+          <i class="fa fa-arrow-right"></i>
         </span>
 
         <%= s.text_field :completed_at_lt, :class => 'datepicker datepicker-to', :value => datepicker_field_value(params[:q][:completed_at_lt]) %>
@@ -12,6 +12,6 @@
     </div>
 
     <div class="actions filter-actions">
-      <%= button Spree.t(:search), 'icon-search'  %>
+      <%= button Spree.t(:search), 'search'  %>
     </div>
 <% end %>

data/app/views/spree/admin/shared/_routes.html.erb

@@ -12,5 +12,6 @@
   Spree.routes.classifications_api = "<%= spree.api_classifications_url(:format => 'json') %>";
   Spree.routes.taxon_products_api = "<%= spree.api_taxon_products_url(:format => 'json') %>";
   Spree.routes.payments_api = "<%= spree.api_order_payments_url(:format => 'json') if params[:order_id] %>";
+  Spree.routes.shipments_api = "<%= spree.api_shipments_url(:format => 'json') %>";
   Spree.routes.stock_items_api = "<%= spree.api_stock_location_stock_items_url(:format => 'json') if params[:stock_location_id] %>";
 </script>

data/app/views/spree/admin/shared/_tabs.html.erb

@@ -1,16 +1,16 @@
 <% if can? :admin, Spree::Order %>
-  <%= tab :orders, :payments, :creditcard_payments, :shipments, :credit_cards, :return_authorizations, :icon => 'icon-shopping-cart' %>
+  <%= tab :orders, :payments, :creditcard_payments, :shipments, :credit_cards, :return_authorizations, :icon => 'shopping-cart' %>
 <% end %>
 <% if can? :admin, Spree::Product %>
-  <%= tab :products, :option_types, :properties, :prototypes, :variants, :product_properties, :taxonomies, :icon => 'icon-th-large' %>
+  <%= tab :products, :option_types, :properties, :prototypes, :variants, :product_properties, :taxonomies, :icon => 'th-large' %>
 <% end %>
 <% if can? :admin, Spree::Admin::ReportsController %>
-  <%= tab :reports, :icon => 'icon-file'  %>
+  <%= tab :reports, :icon => 'file'  %>
 <% end %>
-<%= tab :configurations, :general_settings, :mail_methods, :tax_categories, :tax_rates, :tax_settings, :zones, :countries, :states, :payment_methods, :shipping_methods, :shipping_categories, :stock_transfers, :stock_locations, :trackers, :label => 'configuration', :icon => 'icon-wrench', :url => spree.edit_admin_general_settings_path %>
+<%= tab :configurations, :general_settings, :mail_methods, :tax_categories, :tax_rates, :tax_settings, :zones, :countries, :states, :payment_methods, :shipping_methods, :shipping_categories, :stock_transfers, :stock_locations, :trackers, :label => 'configuration', :icon => 'wrench', :url => spree.edit_admin_general_settings_path %>
 <% if can? :admin, Spree::Promotion %>
-  <%= tab(:promotions, :url => spree.admin_promotions_path, :icon => 'icon-bullhorn') %>
+  <%= tab(:promotions, :url => spree.admin_promotions_path, :icon => 'bullhorn') %>
 <% end %>
 <% if Spree.user_class && can?(:admin, Spree.user_class) %>
-  <%= tab(:users, :url => spree.admin_users_path, :icon => 'icon-user') %>
+  <%= tab(:users, :url => spree.admin_users_path, :icon => 'user') %>
 <% end %>

data/app/views/spree/admin/shipping_categories/edit.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_shipping_categories), spree.admin_shipping_categories_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_shipping_categories), spree.admin_shipping_categories_path, :icon => 'arrow-left' %>
   </li>
 <% end %>
 

data/app/views/spree/admin/shipping_categories/index.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:new_shipping_category), new_object_url, :icon => 'icon-plus' %>
+    <%= button_link_to Spree.t(:new_shipping_category), new_object_url, :icon => 'plus' %>
   </li>
 <% end %>
 

data/app/views/spree/admin/shipping_categories/new.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_shipping_categories_list), spree.admin_shipping_categories_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_shipping_categories_list), spree.admin_shipping_categories_path, :icon => 'arrow-left' %>
   </li>
 <% end %>
 

data/app/views/spree/admin/shipping_methods/_form.html.erb

@@ -1,5 +1,5 @@
 <div data-hook="admin_shipping_method_form_fields" class="alpha twelve columns">
-  <div class="alpha six columns">
+  <div data-hook="admin_shipping_method_form_name_field" class="alpha six columns">
     <%= f.field_container :name do %>
       <%= f.label :name, Spree.t(:name) %><br />
       <%= f.text_field :name, :class => 'fullwidth' %>
@@ -7,7 +7,7 @@
     <% end %>
   </div>
 
-  <div class="omega six columns">
+  <div data-hook="admin_shipping_method_form_display_field" class="omega six columns">
     <%= f.field_container :display_on do %>
       <%= f.label :display_on, Spree.t(:display) %><br />
       <%= select(:shipping_method, :display_on, Spree::ShippingMethod::DISPLAY.collect { |display| [Spree.t(display), display == :both ? nil : display.to_s] }, {}, {:class => 'select2 fullwidth'}) %>
@@ -16,7 +16,7 @@
   </div>
 
   <div class="alpha omega twelve columns">
-    <div class="alpha six columns">
+    <div data-hook="admin_shipping_method_form_internal_name_field" class="alpha six columns">
       <%= f.field_container :admin_name do %>
         <%= f.label :admin_name, Spree.t(:internal_name) %><br />
         <%= f.text_field :admin_name, :class => 'fullwidth', :label => false  %>
@@ -25,7 +25,7 @@
     </div>
   </div>
 
-  <div class="alpha twelve columns">
+  <div data-hook="admin_shipping_method_form_tracking_url_field" class="alpha twelve columns">
     <%= f.field_container :tracking_url do %>
       <%= f.label :tracking_url, Spree.t(:tracking_url) %><br />
       <%= f.text_field :tracking_url, :class => 'fullwidth', :placeholder => Spree.t(:tracking_url_placeholder) %>
@@ -54,9 +54,10 @@
     <fieldset class="no-border-bottom">
       <legend align="center"><%= Spree.t(:zones) %></legend>
       <%= f.field_container :zones do %>
+        <% shipping_method_zones = @shipping_method.zones.to_a %>
         <% Spree::Zone.all.each do |zone| %>
           <%= label_tag do %>
-            <%= check_box_tag('shipping_method[zones][]', zone.id, @shipping_method.zones.include?(zone)) %>
+            <%= check_box_tag('shipping_method[zones][]', zone.id, shipping_method_zones.include?(zone)) %>
             <%= zone.name %>
           <% end %>
           <br>

data/app/views/spree/admin/shipping_methods/edit.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_shipping_methods_list), spree.admin_shipping_methods_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_shipping_methods_list), spree.admin_shipping_methods_path, :icon => 'arrow-left' %>
   </li>
 <% end %>
 

data/app/views/spree/admin/shipping_methods/index.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  :icon => 'icon-plus', :id => 'admin_new_shipping_method_link' %>
+    <%= button_link_to Spree.t(:new_shipping_method), new_object_url,  :icon => 'plus', :id => 'admin_new_shipping_method_link' %>
   </li>
 <% end %>
 
@@ -29,7 +29,7 @@
       </tr>
     </thead>
     <tbody>
-      <% @shipping_methods.each do |shipping_method|%>
+      <% @shipping_methods.includes(:zones, :calculator).each do |shipping_method|%>
         <tr id="<%= spree_dom_id shipping_method %>" data-hook="admin_shipping_methods_index_rows" class="<%= cycle('odd', 'even')%>">
           <td class="align-center"><%= shipping_method.admin_name + ' / ' if shipping_method.admin_name.present? %><%= shipping_method.name %></td>
           <td class="align-center"><%= shipping_method.zones.collect(&:name).join(", ") if shipping_method.zones %></td>

data/app/views/spree/admin/shipping_methods/new.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_shipping_methods_list), spree.admin_shipping_methods_path, :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_shipping_methods_list), spree.admin_shipping_methods_path, :icon => 'arrow-left' %>
   </li>
 <% end %>
 

data/app/views/spree/admin/states/_state_list.html.erb

@@ -19,7 +19,7 @@
         <td><%= state.name %></td>
         <td class="align-center"><%= state.abbr %></td>
         <td class="actions">
-          <%= link_to_with_icon 'icon-edit', Spree.t(:edit), edit_admin_country_state_url(@country, state), :no_text => true %>
+          <%= link_to_with_icon 'edit', Spree.t(:edit), edit_admin_country_state_url(@country, state), :no_text => true %>
           <%= link_to_delete state, :no_text => true %>
         </td>
       </tr>

data/app/views/spree/admin/states/edit.html.erb

@@ -1,12 +1,12 @@
 <%= render :partial => 'spree/admin/shared/configuration_menu' %>
 
 <% content_for :page_title do %>
-  <%= Spree.t(:editing_state) %> <i class="icon-arrow-right"></i> <%= @state.name %>
+  <%= Spree.t(:editing_state) %> <i class="fa fa-arrow-right"></i> <%= @state.name %>
 <% end %>
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to Spree.t(:back_to_states_list), spree.admin_country_states_url(@country), :icon => 'icon-arrow-left' %>
+    <%= button_link_to Spree.t(:back_to_states_list), spree.admin_country_states_url(@country), :icon => 'arrow-left' %>
   </li>
 <% end %>
 

data/app/views/spree/admin/states/index.html.erb

@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li id="new_state_link">
-    <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { :remote => true, :icon => 'icon-plus', :id => 'new_state_link' } %>
+    <%= button_link_to Spree.t(:new_state), new_admin_country_state_url(@country), { :remote => true, :icon => 'plus', :id => 'new_state_link' } %>
   </li>
 <% end %>
 

data/app/views/spree/admin/stock_locations/_transfer_stock_form.html.erb

@@ -31,9 +31,9 @@
     </div>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= button Spree.t(:transfer_stock), 'icon-plus' %>
+      <%= button Spree.t(:transfer_stock), 'plus' %>
       <span class="or"><%= Spree.t(:or) %></span>
-      <%= link_to_with_icon 'icon-remove', Spree.t('actions.cancel'), collection_url, :class => 'button' %>
+      <%= link_to_with_icon 'remove', Spree.t('actions.cancel'), collection_url, :class => 'button' %>
     </div>
   </fieldset>
 <% end %>