diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 861d271b63..ec9ab66e4d 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -10,12 +10,11 @@
<%= tag :meta, name: 'viewport', content: 'width=device-width, initial-scale=1' %>
<%= tag :meta, property: 'og:image', content: asset_path('images/govuk-opengraph-image.png') %>
<%= tag :meta, name: 'theme-color', content: '#0b0c0c' %>
- <%= favicon_link_tag asset_path('images/favicon.ico') %>
- <%= favicon_link_tag asset_path('images/govuk-mask-icon.svg'), rel: 'mask-icon', type: 'image/svg', color: "#0b0c0c" %>
- <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon.png'), rel: 'apple-touch-icon', type: 'image/png' %>
- <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-152x152.png'), rel: 'apple-touch-icon', type: 'image/png', size: '152x152' %>
- <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-167x167.png'), rel: 'apple-touch-icon', type: 'image/png', size: '167x167' %>
- <%= favicon_link_tag asset_path('images/govuk-apple-touch-icon-180x180.png'), rel: 'apple-touch-icon', type: 'image/png', size: '180x180' %>
+
+ <%= favicon_link_tag image_path('images/favicon.ico'), type: nil, sizes: "48x48" %>
+ <%= favicon_link_tag image_path('images/favicon.svg'), type: 'image/svg+xml', sizes: "any" %>
+ <%= favicon_link_tag image_path('images/govuk-icon-mask.svg'), rel: 'mask-icon', color: "#0b0c0c", type: nil %>
+ <%= favicon_link_tag image_path('images/govuk-icon-180.png'), rel: 'apple-touch-icon', type: nil %>
<%= stylesheet_link_tag "application" %>
<%= javascript_include_tag "application", defer: true %>
diff --git a/public/apple-touch-icon-precomposed.png b/public/apple-touch-icon-precomposed.png
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/public/apple-touch-icon.png b/public/apple-touch-icon.png
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index e69de29bb2..0000000000