diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/server-config.xml b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/server-config.xml
index e28024d45..8b749dc0f 100644
--- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/server-config.xml
+++ b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/server-config.xml
@@ -42,6 +42,7 @@
 		<!-- This property allows the server to create and accept fully-composed
 			 user URIs (with the user-code emebedded) for the device flow -->
 		<property name="allowCompleteDeviceCodeUri" value="true" />
+		<property name="favicon" value="${favicon}"/>
 	</bean>
 	
 </beans>
diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/bbmri/header.tag b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/bbmri/header.tag
index aeb0a8b7e..4c28758a2 100644
--- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/bbmri/header.tag
+++ b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/bbmri/header.tag
@@ -12,6 +12,7 @@
 
 <o:headerInit title="${title}" reqURL="${reqURL}" baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}" />
 
+<link rel="icon" href="resources/images/bbmri.ico" />
 <link rel="stylesheet" type="text/css" href="${samlResourcesURL}/module.php/bbmri/res/bootstrap/css/bootstrap.min.css" />
 <link rel="stylesheet" type="text/css" href="${samlResourcesURL}/module.php/bbmri/res/css/bbmri.css" />
 
diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/ceitec/header.tag b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/ceitec/header.tag
index 4214110df..eea04ac7c 100644
--- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/ceitec/header.tag
+++ b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/ceitec/header.tag
@@ -12,6 +12,7 @@
 
 <o:headerInit title="${title}" reqURL="${reqURL}" baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}"/>
 
+<link rel="icon" href="resources/images/ceitec.ico" />
 <link rel="stylesheet" type="text/css" href="${samlResourcesURL}/module.php/ceitec/res/bootstrap/css/bootstrap.min.css" />
 <link rel="stylesheet" type="text/css" href="${samlResourcesURL}/module.php/ceitec/res/css/ceitec.css" />
 
diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/cesnet/header.tag b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/cesnet/header.tag
index e25dce99c..6c4b25285 100644
--- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/cesnet/header.tag
+++ b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/cesnet/header.tag
@@ -12,6 +12,7 @@
 
 <o:headerInit title="${title}" reqURL="${reqURL}" baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}" />
 
+<link rel="icon" href="resources/images/cesnet.ico" />
 <link rel="stylesheet" type="text/css" href="${samlResourcesURL}/module.php/cesnet/res/bootstrap/css/bootstrap.min.css" />
 <link rel="stylesheet" type="text/css" href="${samlResourcesURL}/module.php/cesnet/res/css/cesnet.css" />
 
diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/common/headerInit.tag b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/common/headerInit.tag
index 7060d202d..62a6c60d7 100644
--- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/common/headerInit.tag
+++ b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/common/headerInit.tag
@@ -18,5 +18,6 @@
     <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0" />
     <meta name="robots" content="noindex, nofollow" />
 
+    <link rel="icon" href="${config.favicon}"/>
     <link rel="stylesheet" type="text/css" href="${samlResourcesURL}/resources/default.css" />
     <link rel="stylesheet" type="text/css" href="resources/css/customs.css">
diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/einfra/header.tag b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/einfra/header.tag
index 11d9c947f..d0c05fd14 100644
--- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/einfra/header.tag
+++ b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/einfra/header.tag
@@ -12,6 +12,7 @@
 
 <o:headerInit title="${title}" reqURL="${reqURL}" baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}" />
 
+<link rel="icon" href="resources/images/einfra.ico" />
 <link rel="stylesheet" type="text/css" href="${samlResourcesURL}/module.php/cesnet/res/bootstrap/css/bootstrap.min.css" />
 <link rel="stylesheet" type="text/css" href="${samlResourcesURL}/module.php/cesnet/res/css/einfra.css" />
 
diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/elixir/header.tag b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/elixir/header.tag
index 33260a391..52814cee5 100644
--- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/elixir/header.tag
+++ b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/elixir/header.tag
@@ -12,6 +12,7 @@
 
 <o:headerInit title="${title}" reqURL="${reqURL}" baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}"/>
 
+<link rel="icon" href="resources/images/elixir.ico" />
 <link rel="stylesheet" type="text/css" href="${samlResourcesURL}/module.php/elixir/res/bootstrap/css/bootstrap.min.css" />
 <link rel="stylesheet" type="text/css" href="${samlResourcesURL}/module.php/elixir/res/css/elixir.css" />
 
diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/europdx/header.tag b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/europdx/header.tag
index 5866e05fe..3e1951c5d 100644
--- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/europdx/header.tag
+++ b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/europdx/header.tag
@@ -12,6 +12,7 @@
 
 <o:headerInit title="${title}" reqURL="${reqURL}" baseURL="${baseURL}" samlResourcesURL="${samlResourcesURL}" />
 
+<link rel="icon" href="resources/images/europdx.ico" />
 <link rel="stylesheet" type="text/css" href="${samlResourcesURL}/module.php/europdx/res/bootstrap/css/bootstrap.min.css" />
 <link rel="stylesheet" type="text/css" href="${samlResourcesURL}/module.php/europdx/res/css/europdx.css" />
 
diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/header.tag b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/header.tag
index 5f9d7079f..78b270f8f 100644
--- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/header.tag
+++ b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/header.tag
@@ -30,7 +30,7 @@
     <![endif]-->
 
     <!-- favico -->
-    <link rel="shortcut icon" href="resources/images/mitreid-connect.ico">
+    <link rel="shortcut icon" href="${config.favicon}">
 
     <!-- Load jQuery up here so that we can use in-page functions -->
     <script type="text/javascript" src="resources/js/lib/jquery.js"></script>
diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/muni/header.tag b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/muni/header.tag
index d7c3b89b3..6d80af1ac 100644
--- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/muni/header.tag
+++ b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/tags/muni/header.tag
@@ -18,6 +18,7 @@
 
     <title><spring:message code="unified_login"/> | ${title}</title>
 
+    <link rel="icon" href="resources/images/muni.ico" />
     <link rel="stylesheet" type="text/css" href="https://id.muni.cz/simplesaml/module.php/muni/css/bootstrap.min.css">
     <link rel="stylesheet" type="text/css" href="https://id.muni.cz/simplesaml/module.php/muni/css/style-ie.css?1.2">
     <link rel="stylesheet" type="text/css" href="https://id.muni.cz/simplesaml/module.php/muni/css/style.css?1.2">
diff --git a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/user-context.xml b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/user-context.xml
index 16b5bf345..fe1f3d696 100644
--- a/perun-oidc-server-webapp/src/main/webapp/WEB-INF/user-context.xml
+++ b/perun-oidc-server-webapp/src/main/webapp/WEB-INF/user-context.xml
@@ -97,6 +97,7 @@
 				<prop key="main.oidc.issuer.url">https://perun-dev.meta.zcu.cz/oidc/</prop>
 				<prop key="logo.image.url">resources/images/perun_24px.png</prop>
 				<prop key="topbar.title">Perun OIDC</prop>
+				<prop key="favicon">resources/images/mitreid-connect.ico</prop>
 				<prop key="admins">3197,59835</prop>
 				<prop key="perun.adapter.callFallback">true</prop>
 				<prop key="fill.missing.user.attrs">true</prop>
diff --git a/perun-oidc-server-webapp/src/main/webapp/resources/images/bbmri.ico b/perun-oidc-server-webapp/src/main/webapp/resources/images/bbmri.ico
new file mode 100644
index 000000000..7c111ef38
Binary files /dev/null and b/perun-oidc-server-webapp/src/main/webapp/resources/images/bbmri.ico differ
diff --git a/perun-oidc-server-webapp/src/main/webapp/resources/images/ceitec.ico b/perun-oidc-server-webapp/src/main/webapp/resources/images/ceitec.ico
new file mode 100644
index 000000000..ddc7e894b
Binary files /dev/null and b/perun-oidc-server-webapp/src/main/webapp/resources/images/ceitec.ico differ
diff --git a/perun-oidc-server-webapp/src/main/webapp/resources/images/cesnet.ico b/perun-oidc-server-webapp/src/main/webapp/resources/images/cesnet.ico
new file mode 100644
index 000000000..7330e37f6
Binary files /dev/null and b/perun-oidc-server-webapp/src/main/webapp/resources/images/cesnet.ico differ
diff --git a/perun-oidc-server-webapp/src/main/webapp/resources/images/einfra.ico b/perun-oidc-server-webapp/src/main/webapp/resources/images/einfra.ico
new file mode 100644
index 000000000..4547b483f
Binary files /dev/null and b/perun-oidc-server-webapp/src/main/webapp/resources/images/einfra.ico differ
diff --git a/perun-oidc-server-webapp/src/main/webapp/resources/images/elixir.ico b/perun-oidc-server-webapp/src/main/webapp/resources/images/elixir.ico
new file mode 100644
index 000000000..9310f7c6a
Binary files /dev/null and b/perun-oidc-server-webapp/src/main/webapp/resources/images/elixir.ico differ
diff --git a/perun-oidc-server-webapp/src/main/webapp/resources/images/europdx.ico b/perun-oidc-server-webapp/src/main/webapp/resources/images/europdx.ico
new file mode 100644
index 000000000..9278908ba
Binary files /dev/null and b/perun-oidc-server-webapp/src/main/webapp/resources/images/europdx.ico differ
diff --git a/perun-oidc-server-webapp/src/main/webapp/resources/images/muni.ico b/perun-oidc-server-webapp/src/main/webapp/resources/images/muni.ico
new file mode 100644
index 000000000..e41dd3698
Binary files /dev/null and b/perun-oidc-server-webapp/src/main/webapp/resources/images/muni.ico differ
diff --git a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/ConfigurationPropertiesBean.java b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/ConfigurationPropertiesBean.java
index aecd9a15d..9021fca32 100644
--- a/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/ConfigurationPropertiesBean.java
+++ b/perun-oidc-server/src/main/java/cz/muni/ics/openid/connect/config/ConfigurationPropertiesBean.java
@@ -43,6 +43,7 @@ public class ConfigurationPropertiesBean {
 	private String topbarTitle;
 	private String shortTopbarTitle;
 	private String logoImageUrl;
+	private String favicon = "resources/images/mitreid-connect.ico";
 	private Long regTokenLifeTime;
 	private Long rqpTokenLifeTime;
 	private boolean forceHttps = false; // by default we just log a warning for HTTPS deployment
@@ -178,4 +179,11 @@ public class ConfigurationPropertiesBean {
 		this.allowCompleteDeviceCodeUri = allowCompleteDeviceCodeUri;
 	}
 
+	public String getFavicon() {
+		return favicon;
+	}
+
+	public void setFavicon(String favicon) {
+		this.favicon = favicon;
+	}
 }