diff --git a/files/routes/static.py b/files/routes/static.py
index b87c081b7..894c1af9a 100644
--- a/files/routes/static.py
+++ b/files/routes/static.py
@@ -98,7 +98,7 @@ def index():
 
 @app.get("/assets/favicon.ico")
 def favicon():
-	return send_file(f"./assets/images/{site_name}/favicon.gif")
+	return send_file(f"./assets/images/{site_name}/icon.gif")
 
 @app.get("/api")
 @auth_desired
diff --git a/files/templates/default.html b/files/templates/default.html
index b1127d8eb..aea227094 100644
--- a/files/templates/default.html
+++ b/files/templates/default.html
@@ -829,7 +829,7 @@
 
 	<meta name="thumbnail" content="/assets/images/{{'SITE_NAME' | app_config}}/preview.gif">
 
-	<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif">
+	<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif">
 	
 	{% block title %}
 	<title>{{'SITE_NAME' | app_config}}</title>
@@ -862,12 +862,12 @@
 	<meta name="format-detection" content="telephone=no">
 	<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no">
 
-	<link rel="apple-touch-icon" sizes="180x180" href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif">
-	<!---<link rel="icon" type="image/png" sizes="32x32" href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif">
-		<link rel="icon" type="image/png" sizes="16x16" href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif">--->
+	<link rel="apple-touch-icon" sizes="180x180" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif">
+	<!---<link rel="icon" type="image/png" sizes="32x32" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif">
+		<link rel="icon" type="image/png" sizes="16x16" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif">--->
 		<link rel="manifest" href="/assets/manifest.json">
-		<link rel="mask-icon" href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif" color="#{{'DEFAULT_COLOR' | app_config}}">
-		<link rel="shortcut icon" href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif">
+		<link rel="mask-icon" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif" color="#{{'DEFAULT_COLOR' | app_config}}">
+		<link rel="shortcut icon" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif">
 		<meta name="apple-mobile-web-app-title" content="{{'SITE_NAME' | app_config}}">
 		<meta name="application-name" content="{{'SITE_NAME' | app_config}}">
 		<meta name="msapplication-TileColor" content="#{{'DEFAULT_COLOR' | app_config}}">
@@ -879,127 +879,127 @@
 		<link
 		rel="apple-touch-startup-image"
 		sizes="320x480"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="640x960"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-icon"
 		sizes="640x1136"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-icon"
 		sizes="750x1334"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="768x1004"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="768x1024"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="828x1792"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1024x748"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1024x768"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1125x2436"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1242x2208"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1242x2688"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1334x750"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1536x2008"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1536x2048"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1668x2224"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="1792x828"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="2048x1496"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="2048x1536"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="2048x2732"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="2208x1242"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="2224x1668"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="2436x1125"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="2668x1242"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 		<link
 		rel="apple-touch-startup-image"
 		sizes="2737x2048"
-		href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif"
+		href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif"
 		/>
 
 
diff --git a/files/templates/errors/502.html b/files/templates/errors/502.html
index cbab3d484..35cf37db5 100644
--- a/files/templates/errors/502.html
+++ b/files/templates/errors/502.html
@@ -2,7 +2,7 @@
 	<meta charset="utf-8"><script type="text/javascript" src="https://bam.nr-data.net/1/NRJS-db6932013d2347947a2?a=662331301&amp;v=1184.ab39b52&amp;to=NgRbYRRQDxZSBRFYDA9Of0AIUhUMXAhKQxYQEExGSFkECUMDF0JNFhNYRRZUExYJBxBFCz4FXEYPQwQBHVoJXgAADUoLSEYTBEMWAEM%3D&amp;rst=334&amp;ck=1&amp;ref=/error/502&amp;ap=7&amp;be=283&amp;fe=325&amp;dc=325&amp;perf=%7B%22timing%22:%7B%22of%22:1604254029780,%22n%22:0,%22u%22:175,%22ue%22:175,%22f%22:9,%22dn%22:9,%22dne%22:9,%22c%22:9,%22ce%22:9,%22rq%22:14,%22rp%22:160,%22rpe%22:163,%22dl%22:176,%22di%22:248,%22ds%22:250,%22de%22:250,%22dc%22:282,%22l%22:282,%22le%22:287%7D,%22navigation%22:%7B%7D%7D&amp;fp=290&amp;fcp=290&amp;jsonp=NREUM.setToken"></script><script src="https://js-agent.newrelic.com/nr-1184.min.js"></script><script type="text/javascript">(window.NREUM||(NREUM={})).loader_config={licenseKey:"NRJS-db6932013d2347947a2",applicationID:"662331301"};window.NREUM||(NREUM={}),__nr_require=function(e,t,n){function r(n){if(!t[n]){var i=t[n]={exports:{}};e[n][0].call(i.exports,function(t){var i=e[n][1][t];return r(i||t)},i,i.exports)}return t[n].exports}if("function"==typeof __nr_require)return __nr_require;for(var i=0;i<n.length;i++)r(n[i]);return r}({1:[function(e,t,n){function r(){}function i(e,t,n){return function(){return o(e,[u.now()].concat(c(arguments)),t?null:this,n),t?void 0:this}}var o=e("handle"),a=e(6),c=e(7),f=e("ee").get("tracer"),u=e("loader"),s=NREUM;"undefined"==typeof window.newrelic&&(newrelic=s);var d=["setPageViewName","setCustomAttribute","setErrorHandler","finished","addToTrace","inlineHit","addRelease"],p="api-",l=p+"ixn-";a(d,function(e,t){s[t]=i(p+t,!0,"api")}),s.addPageAction=i(p+"addPageAction",!0),s.setCurrentRouteName=i(p+"routeName",!0),t.exports=newrelic,s.interaction=function(){return(new r).get()};var m=r.prototype={createTracer:function(e,t){var n={},r=this,i="function"==typeof t;return o(l+"tracer",[u.now(),e,n],r),function(){if(f.emit((i?"":"no-")+"fn-start",[u.now(),r,i],n),i)try{return t.apply(this,arguments)}catch(e){throw f.emit("fn-err",[arguments,this,e],n),e}finally{f.emit("fn-end",[u.now()],n)}}}};a("actionText,setName,setAttribute,save,ignore,onEnd,getContext,end,get".split(","),function(e,t){m[t]=i(l+t)}),newrelic.noticeError=function(e,t){"string"==typeof e&&(e=new Error(e)),o("err",[e,u.now(),!1,t])}},{}],2:[function(e,t,n){function r(){return c.exists&&performance.now?Math.round(performance.now()):(o=Math.max((new Date).getTime(),o))-a}function i(){return o}var o=(new Date).getTime(),a=o,c=e(8);t.exports=r,t.exports.offset=a,t.exports.getLastTimestamp=i},{}],3:[function(e,t,n){function r(e,t){var n=e.getEntries();n.forEach(function(e){"first-paint"===e.name?d("timing",["fp",Math.floor(e.startTime)]):"first-contentful-paint"===e.name&&d("timing",["fcp",Math.floor(e.startTime)])})}function i(e,t){var n=e.getEntries();n.length>0&&d("lcp",[n[n.length-1]])}function o(e){e.getEntries().forEach(function(e){e.hadRecentInput||d("cls",[e])})}function a(e){if(e instanceof m&&!g){var t=Math.round(e.timeStamp),n={type:e.type};t<=p.now()?n.fid=p.now()-t:t>p.offset&&t<=Date.now()?(t-=p.offset,n.fid=p.now()-t):t=p.now(),g=!0,d("timing",["fi",t,n])}}function c(e){d("pageHide",[p.now(),e])}if(!("init"in NREUM&&"page_view_timing"in NREUM.init&&"enabled"in NREUM.init.page_view_timing&&NREUM.init.page_view_timing.enabled===!1)){var f,u,s,d=e("handle"),p=e("loader"),l=e(5),m=NREUM.o.EV;if("PerformanceObserver"in window&&"function"==typeof window.PerformanceObserver){f=new PerformanceObserver(r);try{f.observe({entryTypes:["paint"]})}catch(v){}u=new PerformanceObserver(i);try{u.observe({entryTypes:["largest-contentful-paint"]})}catch(v){}s=new PerformanceObserver(o);try{s.observe({type:"layout-shift",buffered:!0})}catch(v){}}if("addEventListener"in document){var g=!1,y=["click","keydown","mousedown","pointerdown","touchstart"];y.forEach(function(e){document.addEventListener(e,a,!1)})}l(c)}},{}],4:[function(e,t,n){function r(e,t){if(!i)return!1;if(e!==i)return!1;if(!t)return!0;if(!o)return!1;for(var n=o.split("."),r=t.split("."),a=0;a<r.length;a++)if(r[a]!==n[a])return!1;return!0}var i=null,o=null,a=/Version\/(\S+)\s+Safari/;if(navigator.userAgent){var c=navigator.userAgent,f=c.match(a);f&&c.indexOf("Chrome")===-1&&c.indexOf("Chromium")===-1&&(i="Safari",o=f[1])}t.exports={agent:i,version:o,match:r}},{}],5:[function(e,t,n){function r(e){function t(){e(a&&document[a]?document[a]:document[i]?"hidden":"visible")}"addEventListener"in document&&o&&document.addEventListener(o,t,!1)}t.exports=r;var i,o,a;"undefined"!=typeof document.hidden?(i="hidden",o="visibilitychange",a="visibilityState"):"undefined"!=typeof document.msHidden?(i="msHidden",o="msvisibilitychange"):"undefined"!=typeof document.webkitHidden&&(i="webkitHidden",o="webkitvisibilitychange",a="webkitVisibilityState")},{}],6:[function(e,t,n){function r(e,t){var n=[],r="",o=0;for(r in e)i.call(e,r)&&(n[o]=t(r,e[r]),o+=1);return n}var i=Object.prototype.hasOwnProperty;t.exports=r},{}],7:[function(e,t,n){function r(e,t,n){t||(t=0),"undefined"==typeof n&&(n=e?e.length:0);for(var r=-1,i=n-t||0,o=Array(i<0?0:i);++r<i;)o[r]=e[t+r];return o}t.exports=r},{}],8:[function(e,t,n){t.exports={exists:"undefined"!=typeof window.performance&&window.performance.timing&&"undefined"!=typeof window.performance.timing.navigationStart}},{}],ee:[function(e,t,n){function r(){}function i(e){function t(e){return e&&e instanceof r?e:e?f(e,c,o):o()}function n(n,r,i,o){if(!p.aborted||o){e&&e(n,r,i);for(var a=t(i),c=v(n),f=c.length,u=0;u<f;u++)c[u].apply(a,r);var d=s[w[n]];return d&&d.push([b,n,r,a]),a}}function l(e,t){h[e]=v(e).concat(t)}function m(e,t){var n=h[e];if(n)for(var r=0;r<n.length;r++)n[r]===t&&n.splice(r,1)}function v(e){return h[e]||[]}function g(e){return d[e]=d[e]||i(n)}function y(e,t){u(e,function(e,n){t=t||"feature",w[n]=t,t in s||(s[t]=[])})}var h={},w={},b={on:l,addEventListener:l,removeEventListener:m,emit:n,get:g,listeners:v,context:t,buffer:y,abort:a,aborted:!1};return b}function o(){return new r}function a(){(s.api||s.feature)&&(p.aborted=!0,s=p.backlog={})}var c="nr@context",f=e("gos"),u=e(6),s={},d={},p=t.exports=i();p.backlog=s},{}],gos:[function(e,t,n){function r(e,t,n){if(i.call(e,t))return e[t];var r=n();if(Object.defineProperty&&Object.keys)try{return Object.defineProperty(e,t,{value:r,writable:!0,enumerable:!1}),r}catch(o){}return e[t]=r,r}var i=Object.prototype.hasOwnProperty;t.exports=r},{}],handle:[function(e,t,n){function r(e,t,n,r){i.buffer([e],r),i.emit(e,t,n)}var i=e("ee").get("handle");t.exports=r,r.ee=i},{}],id:[function(e,t,n){function r(e){var t=typeof e;return!e||"object"!==t&&"function"!==t?-1:e===window?0:a(e,o,function(){return i++})}var i=1,o="nr@id",a=e("gos");t.exports=r},{}],loader:[function(e,t,n){function r(){if(!E++){var e=b.info=NREUM.info,t=p.getElementsByTagName("script")[0];if(setTimeout(u.abort,3e4),!(e&&e.licenseKey&&e.applicationID&&t))return u.abort();f(h,function(t,n){e[t]||(e[t]=n)});var n=a();c("mark",["onload",n+b.offset],null,"api"),c("timing",["load",n]);var r=p.createElement("script");r.src="https://"+e.agent,t.parentNode.insertBefore(r,t)}}function i(){"complete"===p.readyState&&o()}function o(){c("mark",["domContent",a()+b.offset],null,"api")}var a=e(2),c=e("handle"),f=e(6),u=e("ee"),s=e(4),d=window,p=d.document,l="addEventListener",m="attachEvent",v=d.XMLHttpRequest,g=v&&v.prototype;NREUM.o={ST:setTimeout,SI:d.setImmediate,CT:clearTimeout,XHR:v,REQ:d.Request,EV:d.Event,PR:d.Promise,MO:d.MutationObserver};var y=""+location,h={beacon:"bam.nr-data.net",errorBeacon:"bam.nr-data.net",agent:"js-agent.newrelic.com/nr-1184.min.js"},w=v&&g&&g[l]&&!/CriOS/.test(navigator.userAgent),b=t.exports={offset:a.getLastTimestamp(),now:a,origin:y,features:{},xhrWrappable:w,userAgent:s};e(1),e(3),p[l]?(p[l]("DOMContentLoaded",o,!1),d[l]("load",r,!1)):(p[m]("onreadystatechange",i),d[m]("onload",r)),c("mark",["firstbyte",a.getLastTimestamp()],null,"api");var E=0},{}],"wrap-function":[function(e,t,n){function r(e){return!(e&&e instanceof Function&&e.apply&&!e[a])}var i=e("ee"),o=e(7),a="nr@original",c=Object.prototype.hasOwnProperty,f=!1;t.exports=function(e,t){function n(e,t,n,i){function nrWrapper(){var r,a,c,f;try{a=this,r=o(arguments),c="function"==typeof n?n(r,a):n||{}}catch(u){p([u,"",[r,a,i],c])}s(t+"start",[r,a,i],c);try{return f=e.apply(a,r)}catch(d){throw s(t+"err",[r,a,d],c),d}finally{s(t+"end",[r,a,f],c)}}return r(e)?e:(t||(t=""),nrWrapper[a]=e,d(e,nrWrapper),nrWrapper)}function u(e,t,i,o){i||(i="");var a,c,f,u="-"===i.charAt(0);for(f=0;f<t.length;f++)c=t[f],a=e[c],r(a)||(e[c]=n(a,u?c+i:i,o,c))}function s(n,r,i){if(!f||t){var o=f;f=!0;try{e.emit(n,r,i,t)}catch(a){p([a,n,r,i])}f=o}}function d(e,t){if(Object.defineProperty&&Object.keys)try{var n=Object.keys(e);return n.forEach(function(n){Object.defineProperty(t,n,{get:function(){return e[n]},set:function(t){return e[n]=t,t}})}),t}catch(r){p([r])}for(var i in e)c.call(e,i)&&(t[i]=e[i]);return t}function p(t){try{e.emit("internal-error",t)}catch(n){}}return e||(e=i),n.inPlace=u,n.flag=a,n}},{}]},{},["loader"]);</script><script type="text/javascript">window.NREUM||(NREUM={});NREUM.info={"beacon":"bam.nr-data.net","errorBeacon":"bam.nr-data.net","licenseKey":"NRJS-db6932013d2347947a2","applicationID":"662331301","transactionName":"NgRbYRRQDxZSBRFYDA9Of0AIUhUMXAhKQxYQEExGSFkECUMDF0JNFhNYRRZUExYJBxBFCz4FXEYPQwQBHVoJXgAADUoLSEYTBEMWAEM=","queueTime":0,"applicationTime":7,"agent":""}</script>
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 	<meta name="thumbnail" content="/assets/images/{{'SITE_NAME' | app_config}}/preview.gif">
-	<link rel="icon" type="image/png" href="/assets/{{'SITE_NAME' | app_config}}/favicon.gif">
+	<link rel="icon" type="image/png" href="/assets/{{'SITE_NAME' | app_config}}/icon.gif">
 	<title>502 Bad Gateway</title>
 	
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
@@ -11,17 +11,17 @@
 	<meta name="apple-touch-fullscreen" content="yes">
 	<meta name="format-detection" content="telephone=no">
 	<meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no">
-	<link rel="apple-touch-icon" sizes="180x180" href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif">
+	<link rel="apple-touch-icon" sizes="180x180" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif">
 	
 	<link rel="manifest" href="/assets/manifest.json">
-	<link rel="mask-icon" href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif" color="#{{'DEFAULT_COLOR' | app_config}}">
-	<link rel="shortcut icon" href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif">
+	<link rel="mask-icon" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif" color="#{{'DEFAULT_COLOR' | app_config}}">
+	<link rel="shortcut icon" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif">
 	<meta name="apple-mobile-web-app-title" content="{{'SITE_NAME' | app_config}}">
 	<meta name="application-name" content="{{'SITE_NAME' | app_config}}">
 	<meta name="msapplication-TileColor" content="#{{'DEFAULT_COLOR' | app_config}}">
 	<meta name="msapplication-config" content="/assets/images/browserconfig.xml">
 	<meta name="theme-color" content="#{{'DEFAULT_COLOR' | app_config}}">
-	<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif">
+	<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif">
 	
 	{% if v %}
 		<link rel="stylesheet" href="/assets/style/{{v.theme}}_{{v.themecolor}}.css">
diff --git a/files/templates/errors/503.html b/files/templates/errors/503.html
index 021be9ee6..06eccf626 100644
--- a/files/templates/errors/503.html
+++ b/files/templates/errors/503.html
@@ -7,7 +7,7 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 
 	<meta name="author" content="">
-	<link rel="icon" type="image/png" href="/assets/{{'SITE_NAME' | app_config}}/favicon.gif">
+	<link rel="icon" type="image/png" href="/assets/{{'SITE_NAME' | app_config}}/icon.gif">
 
 	
 <title>503 Service Unavailable</title>
@@ -18,7 +18,7 @@
 	integrity="sha384-Gn5384xqQ1aoWXA+058RXPxPg6fy4IWvTNh0E263XmFcJlSAwiGgFAW/dAiS6JXm" crossorigin="anonymous">
 
 	<!-- iOS webapp -->
-	<link rel="apple-touch-icon" href="/assets/{{'SITE_NAME' | app_config}}/favicon.gif">
+	<link rel="apple-touch-icon" href="/assets/{{'SITE_NAME' | app_config}}/icon.gif">
 	<meta name="apple-mobile-web-app-capable" content="yes">
 	<meta name="format-detection" content="telephone=no">
 	<meta name="apple-mobile-web-app-title" content="{{'SITE_NAME' | app_config}}">
diff --git a/files/templates/header.html b/files/templates/header.html
index 31640e8d1..9191ac5b5 100644
--- a/files/templates/header.html
+++ b/files/templates/header.html
@@ -4,7 +4,7 @@
 	<div class="container-fluid" style="padding:0;">
 		<div class="flex-grow-1">
 			<a {% if v %}href="/"{% else %}href="/logged_out"{% endif %} class="navbar-brand">
-				<img height="30" src="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif">
+				<img height="30" src="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif">
 				<img src="/assets/images/{{'SITE_NAME' | app_config}}/logo.gif" height="20">
 			</a>
 		</div>
diff --git a/files/templates/settings.html b/files/templates/settings.html
index ed3629823..71d5f8bda 100644
--- a/files/templates/settings.html
+++ b/files/templates/settings.html
@@ -47,7 +47,7 @@
 	<meta name="description" content="">
 	<meta name="author" content="">
 
-	<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif">
+	<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif">
 
 	<title>{% block pagetitle %}Settings - {{'SITE_NAME' | app_config}}{% endblock %}</title>
 		<meta property="og:type" content="article" />
diff --git a/files/templates/settings2.html b/files/templates/settings2.html
index 82697a882..6820aed28 100644
--- a/files/templates/settings2.html
+++ b/files/templates/settings2.html
@@ -9,7 +9,7 @@
 	<meta name="description" content="">
 	<meta name="author" content="">
 	<meta name="thumbnail" content="/assets/images/{{'SITE_NAME' | app_config}}/preview.gif">
-	<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif">
+	<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif">
 
 	<meta property="og:type" content="article" />
 	<meta property="og:title" content="{{'SITE_NAME' | app_config}}" />
diff --git a/files/templates/submit.html b/files/templates/submit.html
index 315060425..0c7184ab2 100644
--- a/files/templates/submit.html
+++ b/files/templates/submit.html
@@ -234,7 +234,7 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
 		<meta name="description" content="">
 		<meta name="author" content="">
-		<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/favicon.gif">
+		<link rel="icon" type="image/png" href="/assets/images/{{'SITE_NAME' | app_config}}/icon.gif">
 
 		{% include "emoji_modal.html" %}
 		{% include "gif_modal.html" %}