diff --git a/app/views/spree/admin/product_groups/_preview.html.erb b/app/views/spree/admin/product_groups/_preview.html.erb
index a2c2b47..a6f1532 100644
--- a/app/views/spree/admin/product_groups/_preview.html.erb
+++ b/app/views/spree/admin/product_groups/_preview.html.erb
@@ -3,7 +3,7 @@
 <h2><%= Spree::ProductGroup.human_attribute_name(:products) %> (<%= count %>)</h2>
 
 <% if count == 0 %>
-  <p data-hook="preview_empty"><%= t(:no_match_found) %></p>
+  <p data-hook="preview_empty"><%= Spree.t(:no_match_found) %></p>
 <% else %>
 
   <% if count > Spree::Config[:admin_pgroup_per_page] %>
@@ -14,7 +14,7 @@
     <thead>
       <tr data-hook="preview_header">
         <th><%= Spree::Product.human_attribute_name(:name) %></th>
-        <th><%= t(:action) %></th>
+        <th><%= Spree.t(:action) %></th>
       </tr>
     </thead>
     <tbody>
@@ -24,7 +24,7 @@
           <%= link_to product.name, product_url(product) %>
         </td>
         <td>
-          <%= link_to t(:edit), edit_admin_product_path(product) %>
+          <%= link_to Spree.t(:edit), edit_admin_product_path(product) %>
         </td>
       </tr>
     <% end %>
diff --git a/app/views/spree/admin/product_groups/_product_scope.html.erb b/app/views/spree/admin/product_groups/_product_scope.html.erb
index a804cf9..5d9ea57 100644
--- a/app/views/spree/admin/product_groups/_product_scope.html.erb
+++ b/app/views/spree/admin/product_groups/_product_scope.html.erb
@@ -19,6 +19,6 @@
     <% end %>
   </td>
   <td class="actions" data-hook="actions">
-    <%= link_to_delete product_scope, url: admin_product_group_product_scope_path(@product_group, product_scope), :no_text => true  %>
+    <%= link_to_with_icon 'cross icon-trash no-text', '', admin_product_group_product_scope_path(@product_group, product_scope), :remote => true, :method => 'delete' %>
   </td>
 </tr>
diff --git a/app/views/spree/admin/product_groups/edit.html.erb b/app/views/spree/admin/product_groups/edit.html.erb
index 74f0328..0ae9cfd 100644
--- a/app/views/spree/admin/product_groups/edit.html.erb
+++ b/app/views/spree/admin/product_groups/edit.html.erb
@@ -7,7 +7,7 @@
 <% content_for :page_actions do %>
   <li>
     <%= button_link_to Spree.t(:back_to_product_groups_list), admin_product_groups_url, :icon => 'icon-arrow-left' %>
-  </li>  
+  </li>
 <% end %>
 
 <fieldset id="product_group_forms_container" data-hook>
@@ -15,19 +15,19 @@
   <%= form_for [:admin, @product_group], :html => { :id => 'product-group-form', :method => :put } do |f| %>
 
       <%= f.field_container :name do %>
-        <%= f.label :name, t(:name) %><br />
+        <%= f.label :name, Spree::ProductGroup.human_attribute_name(:name) %><br />
         <%= f.text_field :name %>
         <%= f.error_message_on :name %>
       <% end %>
 
       <%= f.field_container :permalink do %>
-        <%= f.label :permalink, t(:permalink) %><br />
+        <%= f.label :permalink, Spree::ProductGroup.human_attribute_name(:permalink) %><br />
         <%= f.text_field :permalink %>
         <%= f.error_message_on :permalink %>
       <% end %>
 
       <%= f.field_container :order_scope do %>
-        <%= f.label :order_scope, t(:sort_ordering) %><br />
+        <%= f.label :order_scope, Spree::ProductGroup.human_attribute_name(:sort_ordering) %><br />
         <%= f.select(:order_scope, Spree::Product.simple_scopes.collect{|p| [ t(:name, :scope =>[:product_scopes, :scopes, p]), p.to_s ] }) %>
       <% end %>
 
@@ -35,7 +35,7 @@
         <%= render :partial => 'product_scope', :collection => @product_group.product_scopes.reject {|s| s.is_ordering? } %>
       </table>
 
-    <%= button t(:update) %>
+    <%= button Spree.t(:update) %>
 
   <% end %>
 
@@ -54,7 +54,7 @@
     )
     %>
     <p>
-      <%= label_tag :product_scope_name, t(:add_scope) %>
+      <%= label_tag :product_scope_name, Spree.t(:add_scope) %>
       <%= select_tag 'product_scope[name]', options %>
       <%= submit_tag Spree.t(:add) %>
     </p>
diff --git a/app/views/spree/admin/product_groups/index.html.erb b/app/views/spree/admin/product_groups/index.html.erb
index cd39140..1b39c50 100644
--- a/app/views/spree/admin/product_groups/index.html.erb
+++ b/app/views/spree/admin/product_groups/index.html.erb
@@ -6,7 +6,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <%= button_link_to t(:new_product_group), new_object_url, :icon => 'icon-plus', :id => 'admin_new_product_group_link' %>
+    <%= button_link_to Spree.t(:new_product_group), new_object_url, :icon => 'icon-plus', :id => 'admin_new_product_group_link' %>
   </li>
 <% end %>
 
@@ -25,7 +25,7 @@
         <th><%= Spree::ProductGroup.human_attribute_name(:url) %></th>
         <th><%= Spree::ProductGroup.human_attribute_name(:product_scopes) %></th>
         <th><%= Spree::ProductGroup.human_attribute_name(:product_count) %></th>
-        <th><%= t(:action) %></th>
+        <th><%= Spree.t(:action) %></th>
       </tr>
     </thead>
     <tbody>
@@ -49,4 +49,4 @@
     <%= Spree.t(:no_resource_found, resource: I18n.t(:other, scope: 'activerecord.models.spree/product_group')) %>,
     <%= link_to Spree.t(:add_one), new_object_url %>!
   </div>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/spree/admin/product_groups/new.html.erb b/app/views/spree/admin/product_groups/new.html.erb
index caa67e4..bf2ba7a 100644
--- a/app/views/spree/admin/product_groups/new.html.erb
+++ b/app/views/spree/admin/product_groups/new.html.erb
@@ -7,17 +7,17 @@
 <% content_for :page_actions do %>
   <li>
     <%= button_link_to Spree.t(:back_to_product_groups_list), admin_product_groups_url, :icon => 'icon-arrow-left' %>
-  </li>  
+  </li>
 <% end %>
 
 <%= form_for [:admin, @product_group], :html => { :id => 'product-group-form', :multipart => true } do |f| %>
   <fieldset data-hook="name">
-    <legend><%= t(:product_group) %></legend>
+    <legend><%= Spree::ProductGroup.model_name.human %></legend>
     <%= f.field_container :name do %>
-      <%= f.label :name, t(:name) %>
+      <%= f.label :name, Spree::ProductGroup.human_attribute_name(:name) %>
       <%= f.text_field :name %>
       <%= f.error_message_on :name %>
     <% end %>
   </fieldset>
-  <%=  button t(:create) %>
+  <%=  button Spree.t(:create) %>
 <% end %>
diff --git a/app/views/spree/admin/product_groups/show.html.erb b/app/views/spree/admin/product_groups/show.html.erb
index 7278746..9c24bc1 100644
--- a/app/views/spree/admin/product_groups/show.html.erb
+++ b/app/views/spree/admin/product_groups/show.html.erb
@@ -19,7 +19,7 @@
     <% @product_group.product_scopes.each do |product_scope| %>
       <tr <%= !product_scope.valid? ? "class='invalid'":'' %> data-hook="product_scopes_row">
         <td>
-          <%= product_scope.to_sentence %>
+          <%= product_scope.to_sentence.html_safe %>
         </td>
         <td>
           <%= product_scope.arguments.join(', ') %>