diff --git a/perun-oidc-server-webapp/src/main/resources/localization/messages_cs.properties b/perun-oidc-server-webapp/src/main/resources/localization/messages_cs.properties
index e9f014942..3ef721f53 100644
--- a/perun-oidc-server-webapp/src/main/resources/localization/messages_cs.properties
+++ b/perun-oidc-server-webapp/src/main/resources/localization/messages_cs.properties
@@ -131,7 +131,7 @@ here=zde.
 agree_aup=Souhlas\u00EDm s podm\u00EDnkami u\u017Eit\u00ED
 
 #MUNI header specific
-unif_login="P\u0159ihl\u00E1\u0161en\u00ED na MU"
+unif_login="Jednotn\u00E9 p\u0159ihl\u00E1\u0161en\u00ED MUNI"
 go_to_login_title=P\u0159ej\u00EDt k p\u0159ihl\u00E1\u0161en\u00ED (Kl\u00E1vesov\u00E1 zkratka: Alt + 2)
 go_to_login_text=P\u0159ej\u00EDt k p\u0159ihl\u00E1\u0161en\u00ED
 language=\u010Cesky
@@ -140,12 +140,12 @@ img_width=180
 img_height=34
 other_lang=en
 other_language=English
-muni_logo=MUNI Jednotn\u00E9 p\u0159ihl\u00E1\u0161en\u00ED
+muni_logo=Jednotn\u00E9 p\u0159ihl\u00E1\u0161en\u00ED MUNI
 
 #MUNI footer specific
 masaryk_university=© Masarykova univerzita
 service=Slu\u017Ebu
-unified_login=Jednotn\u00E9 p\u0159ihl\u00E1\u0161en\u00ED na MU
+unified_login=Jednotn\u00E9 p\u0159ihl\u00E1\u0161en\u00ED MUNI
 provided=zaji\u0161\u0165uje
 ics=\u00DAstav v\u00FDpo\u010Detn\u00ED techniky MU
 
diff --git a/perun-oidc-server-webapp/src/main/resources/localization/messages_en.properties b/perun-oidc-server-webapp/src/main/resources/localization/messages_en.properties
index 25d480363..057597046 100644
--- a/perun-oidc-server-webapp/src/main/resources/localization/messages_en.properties
+++ b/perun-oidc-server-webapp/src/main/resources/localization/messages_en.properties
@@ -130,7 +130,7 @@ here=here.
 agree_aup=I agree with the acceptable usage policy
 
 #MUNI header specific
-unif_login=Unified MU login
+unif_login=MUNI Unified Login
 go_to_login_title=Go to login (Shortcut: Alt + 2)
 go_to_login_text=Go to login
 language=English
@@ -139,12 +139,12 @@ img_width=160
 img_height=35
 other_lang=cs
 other_language=\u010Cesky
-muni_logo=MUNI Unified login
+muni_logo=MUNI Unified Login
 
 #MUNI footer specific
 masaryk_university=© Masaryk University
 service=The service
-unified_login=Unified MU login
+unified_login=MUNI Unified Login
 provided=is provided by
 ics=Institute of Computer Science
 
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 6d80af1ac..a7f3adade 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
@@ -8,7 +8,7 @@
 <%@ attribute name="samlResourcesURL" required="true" %>
 <%@ attribute name="cssLinks" required="true" type="java.util.ArrayList<java.lang.String>" %>
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!doctype html>
 <spring:message code="other_lang" var="other_lang"/>
 <html class="no-js touch no-touch" lang="${other_lang}">
 <head>
@@ -18,7 +18,13 @@
 
     <title><spring:message code="unified_login"/> | ${title}</title>
 
-    <link rel="icon" href="resources/images/muni.ico" />
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+    <link rel="manifest" href="/site.webmanifest">
+    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#0000dc">
+    <meta name="msapplication-TileColor" content="#0000dc">
+    <meta name="theme-color" content="#ffffff">
     <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/resources/images/muni.ico b/perun-oidc-server-webapp/src/main/webapp/resources/images/muni.ico
index e41dd3698..536b41864 100644
Binary files a/perun-oidc-server-webapp/src/main/webapp/resources/images/muni.ico and b/perun-oidc-server-webapp/src/main/webapp/resources/images/muni.ico differ