diff --git a/backend/app/views/spree/admin/taxons/_form.html.erb b/backend/app/views/spree/admin/taxons/_form.html.erb
index 5b720beaa2d..2573042cf19 100644
--- a/backend/app/views/spree/admin/taxons/_form.html.erb
+++ b/backend/app/views/spree/admin/taxons/_form.html.erb
@@ -20,7 +20,20 @@
       </div>
     <% end %>
 
-    <%= render "spree/admin/taxons/attachment_forms/#{f.object.attachment_partial_name}", f: f %>
+    <%= f.field_container :icon do %>
+      <%= f.label :icon %><br>
+      <%= f.file_field :icon %>
+      <% if f.object.icon_present? %>
+        <%= image_tag f.object.icon(:mini) %>
+        <%= link_to t('spree.actions.remove'),
+                    admin_taxonomy_taxon_attachment_path(@taxonomy,
+                                                         @taxon.id,
+                                                         attachment_definition: :icon,
+                                                         authenticity_token: form_authenticity_token),
+                    method: :delete,
+                    class: 'btn btn-sm btn-danger' %>
+      <% end %>
+    <% end %>
   </div>
 
   <div class="col-5">
diff --git a/backend/app/views/spree/admin/taxons/attachment_forms/_paperclip.html.erb b/backend/app/views/spree/admin/taxons/attachment_forms/_paperclip.html.erb
deleted file mode 100644
index f6e2d899add..00000000000
--- a/backend/app/views/spree/admin/taxons/attachment_forms/_paperclip.html.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-<% f.object.class.attachment_definitions.each do |attachment, definition| %>
-  <%= f.field_container attachment do %>
-    <%= f.label attachment %><br>
-    <%= f.file_field attachment %>
-    <% if f.object.send(attachment).present? %>
-      <%= image_tag f.object.send(attachment, definition[:default_style]) %>
-      <%= link_to t('spree.actions.remove'),
-                  admin_taxonomy_taxon_attachment_path(@taxonomy,
-                                                       @taxon.id,
-                                                       attachment_definition: attachment,
-                                                       authenticity_token: form_authenticity_token),
-                  method: :delete,
-                  class: 'btn btn-sm btn-danger' %>
-    <% end %>
-  <% end %>
-<% end %>
diff --git a/core/app/models/spree/taxon/active_storage_attachment.rb b/core/app/models/spree/taxon/active_storage_attachment.rb
index fd8b220389e..d4a96d8871a 100644
--- a/core/app/models/spree/taxon/active_storage_attachment.rb
+++ b/core/app/models/spree/taxon/active_storage_attachment.rb
@@ -9,11 +9,5 @@ module Spree::Taxon::ActiveStorageAttachment
                    styles: { mini: '32x32>', normal: '128x128>' },
                    default_style: :mini
     validate :icon_is_an_image
-
-
-  end
-
-  def attachment_partial_name
-    'paperclip'
   end
 end
diff --git a/core/app/models/spree/taxon/paperclip_attachment.rb b/core/app/models/spree/taxon/paperclip_attachment.rb
index f818c6fddb1..490efcbab3b 100644
--- a/core/app/models/spree/taxon/paperclip_attachment.rb
+++ b/core/app/models/spree/taxon/paperclip_attachment.rb
@@ -19,10 +19,6 @@ def icon_present?
     icon.present?
   end
 
-  def attachment_partial_name
-    'paperclip'
-  end
-
   def destroy_attachment(definition)
     return false unless respond_to?(definition)