diff --git a/playbooks/include/proxies-rewrites.yml b/playbooks/include/proxies-rewrites.yml
index 60e6c5a4fe..c491eae230 100644
--- a/playbooks/include/proxies-rewrites.yml
+++ b/playbooks/include/proxies-rewrites.yml
@@ -36,18 +36,18 @@
     website: apps.fedoraproject.org
     path: ^/favicon.ico$
     status: 301
-    target: https://getfedora.org/static/images/favicon.ico
+    target: https://fedoraproject.org/favicon.ico
 
   - role: httpd/domainrewrite
     destname: 00-docs
     website: docs.fedoraproject.org
     path: ^/favicon.ico$
     status: 301
-    target: https://getfedora.org/static/images/favicon.ico
+    target: https://fedoraproject.org/favicon.ico
 
   - role: httpd/domainrewrite
     destname: 00-registry-icon
     website: registry.fedoraproject.org
     path: ^/favicon.ico$
     status: 301
-    target: https://getfedora.org/static/images/favicon.ico
+    target: https://fedoraproject.org/favicon.ico
diff --git a/roles/developer/website/files/developer.conf b/roles/developer/website/files/developer.conf
index 49d0b71295..c7e5ef611c 100644
--- a/roles/developer/website/files/developer.conf
+++ b/roles/developer/website/files/developer.conf
@@ -1,5 +1,5 @@
 DocumentRoot /srv/web/developer.fedoraproject.org
-Alias /favicon.ico /srv/web/fedoraproject.org/static/images/favicon.ico
+Alias /favicon.ico /srv/web/fedoraproject.org/favicon.ico
 
 AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/x-javascript
 
diff --git a/roles/easyfix/gather/files/template.html b/roles/easyfix/gather/files/template.html
index 6a660b8f9d..3a6f61c3bd 100644
--- a/roles/easyfix/gather/files/template.html
+++ b/roles/easyfix/gather/files/template.html
@@ -10,7 +10,7 @@
     <link rel="stylesheet" type="text/css" href="https://fedoraproject.org/static/css/fedora960.css" media="screen" />
     <link rel="stylesheet" type="text/css" href="https://fedoraproject.org/static/css/fedora960-lang.css" media="screen" />
     <!-- legacy -->
-    <link rel="shortcut icon" href="https://fedoraproject.org/static/images/favicon.ico" type="image/vnd.microsoft.icon" />
+    <link rel="shortcut icon" href="https://fedoraproject.org/favicon.ico" type="image/vnd.microsoft.icon" />
 
     <link rel="stylesheet" type="text/css" media="print" href="https://fedoraproject.org/static/css/print.css" />
     <!--[if IE 7]>
diff --git a/roles/fedora-budget/proxy/files/budget.conf b/roles/fedora-budget/proxy/files/budget.conf
index 17c01d1fc4..54d2b505dc 100644
--- a/roles/fedora-budget/proxy/files/budget.conf
+++ b/roles/fedora-budget/proxy/files/budget.conf
@@ -1,5 +1,5 @@
 DocumentRoot /srv/web/budget.fedoraproject.org
-Alias /favicon.ico /srv/web/fedoraproject.org/static/images/favicon.ico
+Alias /favicon.ico /srv/web/fedoraproject.org/favicon.ico
 
 AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/x-javascript
 
diff --git a/roles/fedora-web/alt/files/alt.conf b/roles/fedora-web/alt/files/alt.conf
index b355733abf..d71f5952f8 100644
--- a/roles/fedora-web/alt/files/alt.conf
+++ b/roles/fedora-web/alt/files/alt.conf
@@ -1,5 +1,5 @@
 DocumentRoot /srv/web/alt.fedoraproject.org
-Alias /favicon.ico /srv/web/fedoraproject.org/static/images/favicon.ico
+Alias /favicon.ico /srv/web/fedoraproject.org/favicon.ico
 
 Redirect /pub/alt https://dl.fedoraproject.org/pub/alt
 
diff --git a/roles/fedora-web/arm/files/arm.conf b/roles/fedora-web/arm/files/arm.conf
index 09a99c8e14..1401924b3f 100644
--- a/roles/fedora-web/arm/files/arm.conf
+++ b/roles/fedora-web/arm/files/arm.conf
@@ -1,5 +1,5 @@
 DocumentRoot /srv/web/arm.fedoraproject.org
-Alias /favicon.ico /srv/web/fedoraproject.org/static/images/favicon.ico
+Alias /favicon.ico /srv/web/fedoraproject.org/favicon.ico
 
 AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/x-javascript
 
diff --git a/roles/fedora-web/flocktofedora/files/flocktofedora.org.conf b/roles/fedora-web/flocktofedora/files/flocktofedora.org.conf
index 0764129437..a6570659c7 100644
--- a/roles/fedora-web/flocktofedora/files/flocktofedora.org.conf
+++ b/roles/fedora-web/flocktofedora/files/flocktofedora.org.conf
@@ -1,5 +1,5 @@
 DocumentRoot /srv/web/flocktofedora.org
-Alias /favicon.ico /srv/web/fedoraproject.org/static/images/favicon.ico
+Alias /favicon.ico /srv/web/fedoraproject.org/favicon.ico
 
 AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/x-javascript
 
diff --git a/roles/fedora-web/getfedora/files/getfedora.org.conf b/roles/fedora-web/getfedora/files/getfedora.org.conf
index b0ef6d24bc..a57d11bd83 100644
--- a/roles/fedora-web/getfedora/files/getfedora.org.conf
+++ b/roles/fedora-web/getfedora/files/getfedora.org.conf
@@ -1,5 +1,5 @@
 DocumentRoot /srv/web/getfedora.org
-Alias /favicon.ico /srv/web/fedoraproject.org/static/images/favicon.ico
+Alias /favicon.ico /srv/web/fedoraproject.org/favicon.ico
 
 AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/x-javascript
 
diff --git a/roles/fedora-web/iot/files/iot.conf b/roles/fedora-web/iot/files/iot.conf
index ce504a1228..8a11a96e74 100644
--- a/roles/fedora-web/iot/files/iot.conf
+++ b/roles/fedora-web/iot/files/iot.conf
@@ -1,5 +1,5 @@
 DocumentRoot /srv/web/iot.fedoraproject.org
-Alias /favicon.ico /srv/web/fedoraproject.org/static/images/favicon.ico
+Alias /favicon.ico /srv/web/fedoraproject.org/favicon.ico
 
 AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/x-javascript
 
diff --git a/roles/fedora-web/labs/files/labs.conf b/roles/fedora-web/labs/files/labs.conf
index cc86d59966..f2fed529b8 100644
--- a/roles/fedora-web/labs/files/labs.conf
+++ b/roles/fedora-web/labs/files/labs.conf
@@ -1,5 +1,5 @@
 DocumentRoot /srv/web/labs.fedoraproject.org
-Alias /favicon.ico /srv/web/fedoraproject.org/static/images/favicon.ico
+Alias /favicon.ico /srv/web/fedoraproject.org/favicon.ico
 
 AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/x-javascript
 
diff --git a/roles/fedora-web/mirrors/files/mirrors.conf b/roles/fedora-web/mirrors/files/mirrors.conf
index 2feabbba89..9262d257ca 100644
--- a/roles/fedora-web/mirrors/files/mirrors.conf
+++ b/roles/fedora-web/mirrors/files/mirrors.conf
@@ -1,2 +1,2 @@
 DocumentRoot /srv/web/mirrors.fedoraproject.org
-Alias   /favicon.ico /srv/web/fedoraproject.org/static/images/favicon.ico
+Alias   /favicon.ico /srv/web/fedoraproject.org/favicon.ico
diff --git a/roles/fedora-web/spins/files/spins.conf b/roles/fedora-web/spins/files/spins.conf
index 4b486c7520..e3b596c8af 100644
--- a/roles/fedora-web/spins/files/spins.conf
+++ b/roles/fedora-web/spins/files/spins.conf
@@ -1,5 +1,5 @@
 DocumentRoot /srv/web/spins.fedoraproject.org
-Alias /favicon.ico /srv/web/fedoraproject.org/static/images/favicon.ico
+Alias /favicon.ico /srv/web/fedoraproject.org/favicon.ico
 
 AddOutputFilterByType DEFLATE text/html text/plain text/xml text/css application/x-javascript
 
diff --git a/roles/haproxy/files/503.http b/roles/haproxy/files/503.http
index ffb0f1e9a9..c4301659c8 100644
--- a/roles/haproxy/files/503.http
+++ b/roles/haproxy/files/503.http
@@ -11,7 +11,7 @@ Content-Type: text/html; charset=UTF-8
   <head>
     <link rel="stylesheet" type="text/css" media="all" href="//fedoraproject.org/static/css/fedora.css">
     <link rel="stylesheet" type="text/css" media="print" href="//fedoraproject.org/static/css/print.css">
-    <link rel="shortcut icon" href="//fedoraproject.org/static/images/favicon.ico" type="image/vnd.microsoft.icon">
+    <link rel="shortcut icon" href="//fedoraproject.org/favicon.ico" type="image/vnd.microsoft.icon">
     <!--[if lt IE 7]>
     <style type="text/css">
       #wrapper
diff --git a/roles/people/templates/people.conf b/roles/people/templates/people.conf
index 25111c05e5..ed5a3c0634 100644
--- a/roles/people/templates/people.conf
+++ b/roles/people/templates/people.conf
@@ -93,7 +93,7 @@ NameVirtualHost *:80
   SSLProxyEngine On
   SSLProxyCheckPeerCN on
   SSLProxyCheckPeerExpire on
-  RewriteRule /favicon\.ico$ https://fedoraproject.org/static/images/favicon.ico [proxy]
+  RewriteRule /favicon\.ico$ https://fedoraproject.org/favicon.ico [proxy]
 
 
   # ols.fedoraproject.org
diff --git a/roles/planet/templates/planet.conf b/roles/planet/templates/planet.conf
index e0df5893ca..0efeeb7f83 100644
--- a/roles/planet/templates/planet.conf
+++ b/roles/planet/templates/planet.conf
@@ -37,7 +37,7 @@
       Require all granted
     </Directory>
 
-    RedirectMatch 301 /favicon\.ico$ https://fedoraproject.org/static/images/favicon.ico
+    RedirectMatch 301 /favicon\.ico$ https://fedoraproject.org/favicon.ico
     Redirect /ldc http://fedoraldc.wordpress.com/feed/
     Alias /justfedora /srv/planet/site/edited