diff --git a/_app/_includes/_amsf.html b/_app/_includes/_amsf.html
index 7859632ed..36b98a3a8 100644
--- a/_app/_includes/_amsf.html
+++ b/_app/_includes/_amsf.html
@@ -61,9 +61,36 @@
   Favicons
 {% endcomment %}
 {% capture amsf_favicon %}{{ '/favicon.ico' | prepend: site.base }}{% endcapture %}
+{% capture amsf_favicon_png %}{{ '/favicon.png' | prepend: site.base }}{% endcapture %}
 {% capture amsf_favicon_svg %}{{ '/favicon.svg' | prepend: site.base }}{% endcapture %}
+{% capture amsf_mask_icon %}{{ '/mask-icon.svg' | prepend: site.base }}{% endcapture %}
 {% capture amsf_apple_touch_icon %}{{ '/apple-touch-icon.png' | prepend: site.base }}{% endcapture %}
 
+{% capture amsf_favicons %}
+  {% if site.base != "" %}
+    <link rel="icon" href="{{ amsf_favicon }}">
+  {% endif %}
+
+  {% for static_file in site.static_files %}
+    {% if static_file.path == '/favicon.png' %}
+      <link rel="icon" href="{{ amsf_favicon_png }}" sizes="196x196" type="image/png">
+    {% endif %}
+
+    {% if static_file.path == '/favicon.svg' %}
+      <link rel="icon" href="{{ amsf_favicon_svg }}" sizes="any" type="image/svg+xml">
+    {% endif %}
+
+    {% if static_file.path == '/mask-icon.svg' %}
+      <link rel="mask-icon" href="{{ amsf_mask_icon }}" color="{{ site.primary_color }}">
+    {% endif %}
+
+    {% if static_file.path == '/apple-touch-icon.png' %}
+      <link rel="apple-touch-icon" href="{{ amsf_apple_touch_icon }}">
+    {% endif %}
+  {% endfor %}
+{% endcapture %}
+
+
 {% comment %}
   Feed URL
 {% endcomment %}
diff --git a/_app/_includes/themes/curtana/includes/top.html b/_app/_includes/themes/curtana/includes/top.html
index ae47241a5..3aebe3ab8 100644
--- a/_app/_includes/themes/curtana/includes/top.html
+++ b/_app/_includes/themes/curtana/includes/top.html
@@ -15,14 +15,7 @@
 <link rel="alternate" href="{{ amsf_feed_url }}" type="application/atom+xml">
 
 <!-- Site icons -->
-{% if site.base != "" %}
-  <link rel="icon" href="{{ amsf_favicon }}">
-  <link rel="icon" href="{{ amsf_favicon_svg }}" sizes="any" type="image/svg+xml">
-  <link rel="apple-touch-icon" href="{{ amsf_apple_touch_icon }}">
-{% endif %}
-
-<!-- Pinned icon for Safari -->
-<link rel="mask-icon" href="{{ amsf_favicon_svg }}" color="{{ site.primary_color }}">
+{{ amsf_favicons }}
 
 <!-- Main CSS -->
 <link rel="stylesheet" href="{{ '/css/app.css?assets-inline' | prepend: amsf_theme_assets }}">
diff --git a/_app/favicon.ico b/_app/favicon.ico
index d2b48b7d0..33ba84175 100644
Binary files a/_app/favicon.ico and b/_app/favicon.ico differ
diff --git a/_app/favicon.png b/_app/favicon.png
new file mode 100644
index 000000000..9c92c235c
Binary files /dev/null and b/_app/favicon.png differ
diff --git a/_app/favicon.svg b/_app/favicon.svg
index 9fa422001..b5f314f70 100644
--- a/_app/favicon.svg
+++ b/_app/favicon.svg
@@ -1 +1 @@
-<svg width="208" height="208" viewBox="0 0 208 208" xmlns="http://www.w3.org/2000/svg"><title>logo-black-mask-icon@1x</title><path d="M194 104c0-49.706-40.294-90-90-90s-90 40.294-90 90c0 25.874 10.918 49.198 28.4 65.615l3.206-32.727c.808-8.238 8.176-14.917 16.462-14.917 8.285 0 14.347 6.67 13.538 14.92l-4.97 50.724C80.952 191.734 92.21 194 104 194c2.19 0 4.36-.078 6.51-.232l9.986-101.88c.807-8.238 8.176-14.917 16.462-14.917 8.284 0 14.346 6.67 13.538 14.92l-9.217 94.052C172.38 171.77 194 140.41 194 104z" fill-rule="evenodd"/></svg>
\ No newline at end of file
+<svg width="180" height="180" viewBox="0 0 180 180" xmlns="http://www.w3.org/2000/svg"><title>Almace Scaffolding</title><path d="M180 90c0-49.706-40.294-90-90-90S0 40.294 0 90c0 25.874 10.918 49.198 28.4 65.615l3.206-32.727c.808-8.238 8.176-14.917 16.462-14.917 8.285 0 14.347 6.67 13.538 14.92l-4.97 50.724C66.952 177.734 78.21 180 90 180c2.19 0 4.36-.078 6.51-.232l9.986-101.88c.807-8.238 8.176-14.917 16.462-14.917 8.284 0 14.346 6.67 13.538 14.92l-9.217 94.052C158.38 157.77 180 126.41 180 90z" fill="#FF00B4" fill-rule="evenodd"/></svg>
diff --git a/_app/mask-icon.svg b/_app/mask-icon.svg
new file mode 100644
index 000000000..9fa422001
--- /dev/null
+++ b/_app/mask-icon.svg
@@ -0,0 +1 @@
+<svg width="208" height="208" viewBox="0 0 208 208" xmlns="http://www.w3.org/2000/svg"><title>logo-black-mask-icon@1x</title><path d="M194 104c0-49.706-40.294-90-90-90s-90 40.294-90 90c0 25.874 10.918 49.198 28.4 65.615l3.206-32.727c.808-8.238 8.176-14.917 16.462-14.917 8.285 0 14.347 6.67 13.538 14.92l-4.97 50.724C80.952 191.734 92.21 194 104 194c2.19 0 4.36-.078 6.51-.232l9.986-101.88c.807-8.238 8.176-14.917 16.462-14.917 8.284 0 14.346 6.67 13.538 14.92l-9.217 94.052C172.38 171.77 194 140.41 194 104z" fill-rule="evenodd"/></svg>
\ No newline at end of file