diff --git a/app/assets/javascripts/repositories/renderers/view_renderers.js b/app/assets/javascripts/repositories/renderers/view_renderers.js
index b67fa7c29..364bf1aaf 100644
--- a/app/assets/javascripts/repositories/renderers/view_renderers.js
+++ b/app/assets/javascripts/repositories/renderers/view_renderers.js
@@ -5,7 +5,7 @@ $.fn.dataTable.render.RepositoryAssetValue = function(data) {
   if (asset.id) {
     return `
       <div class="asset-value-cell">
-        ${asset.icon_html}
+        <i class="sn-icon sn-icon-${asset.icon_html}"></i>
         <div>
           <a  class="file-preview-link"
             id="modal_link${asset.id}"
diff --git a/app/assets/stylesheets/steps/step_attachments.scss b/app/assets/stylesheets/steps/step_attachments.scss
index 612b850b8..56bd1eec2 100644
--- a/app/assets/stylesheets/steps/step_attachments.scss
+++ b/app/assets/stylesheets/steps/step_attachments.scss
@@ -85,10 +85,6 @@
         display: none;
       }
     }
-
-    #wopi_file_edit_button {
-      margin-left: -8px;
-    }
   }
 
   .add-file-modal {
diff --git a/app/serializers/repository_datatable/repository_asset_value_serializer.rb b/app/serializers/repository_datatable/repository_asset_value_serializer.rb
index ada2d2eec..895299b19 100644
--- a/app/serializers/repository_datatable/repository_asset_value_serializer.rb
+++ b/app/serializers/repository_datatable/repository_asset_value_serializer.rb
@@ -12,7 +12,7 @@ module RepositoryDatatable
         url: rails_blob_path(asset.file, disposition: 'attachment'),
         preview_url: asset_file_preview_path(asset),
         file_name: escape_input(asset.file_name),
-        icon_html: FileIconsHelper.file_extension_icon_html(asset)
+        icon_html: FileIconsHelper.sn_icon_for(asset)
       }
     rescue StandardError => e
       Rails.logger.error e.message
diff --git a/app/views/assets/wopi/_file_wopi_controls.html.erb b/app/views/assets/wopi/_file_wopi_controls.html.erb
index 2ab712f82..89acb2595 100644
--- a/app/views/assets/wopi/_file_wopi_controls.html.erb
+++ b/app/views/assets/wopi/_file_wopi_controls.html.erb
@@ -3,7 +3,7 @@
           id: 'wopi_file_edit_button',
           class: 'btn btn-light',
           target: '_blank' do %>
-    <%= file_application_icon(asset) %>
+    <i class="sn-icon sn-icon-<%= sn_icon_for(asset) %>"></i>
     <%= wopi_button_text(asset, 'edit') %>
   <% end %>
 <% else %>
@@ -13,7 +13,7 @@
           target: '_blank',
           title: title,
           disabled: true do %>
-    <%= file_application_icon(asset) %>
+    <i class="sn-icon sn-icon-<%= sn_icon_for(asset) %>"></i>
     <%= wopi_button_text(asset, 'edit') %>
   <% end %>
 <% end %>