diff --git a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.typoscript b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.typoscript
index 256f33a2..29bd019c 100644
--- a/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.typoscript
+++ b/web/typo3conf/ext/ep_theme/Configuration/TypoScript/Page/Main.typoscript
@@ -18,7 +18,31 @@ page {
     bodyTagCObject.stdWrap.override = {$plugin.tx_eptheme.settings.defaultBodyclass}
     bodyTagCObject.stdWrap.override.if.isFalse.field = tx_eptheme_bodyclass
 
-    shortcutIcon = EXT:ep_theme/Resources/Public/images/favicon_ep.ico
+    headerData.333 = TEXT
+    headerData.333.value (
+<link rel="shortcut icon" type="image/x-icon" href="/typo3conf/ext/ep_theme/Resources/Public/images/favicon.ico">
+<link rel="icon" type="image/x-icon" href="/typo3conf/ext/ep_theme/Resources/Public/images/favicon.ico">
+<link rel="icon" type="image/gif" href="/typo3conf/ext/ep_theme/Resources/Public/images/favicon.gif">
+<link rel="icon" type="image/png" href="/typo3conf/ext/ep_theme/Resources/Public/images/favicon.png">
+<link rel="apple-touch-icon" href="/typo3conf/ext/ep_theme/Resources/Public/images/apple-touch-icon.png">
+<link rel="apple-touch-icon" href="/typo3conf/ext/ep_theme/Resources/Public/images/apple-touch-icon-57x57.png" sizes="57x57">
+<link rel="apple-touch-icon" href="/typo3conf/ext/ep_theme/Resources/Public/images/apple-touch-icon-60x60.png" sizes="60x60">
+<link rel="apple-touch-icon" href="/typo3conf/ext/ep_theme/Resources/Public/images/apple-touch-icon-72x72.png" sizes="72x72">
+<link rel="apple-touch-icon" href="/typo3conf/ext/ep_theme/Resources/Public/images/apple-touch-icon-76x76.png" sizes="76x76">
+<link rel="apple-touch-icon" href="/typo3conf/ext/ep_theme/Resources/Public/images/apple-touch-icon-114x114.png" sizes="114x114">
+<link rel="apple-touch-icon" href="/typo3conf/ext/ep_theme/Resources/Public/images/apple-touch-icon-120x120.png" sizes="120x120">
+<link rel="apple-touch-icon" href="/typo3conf/ext/ep_theme/Resources/Public/images/apple-touch-icon-128x128.png" sizes="128x128">
+<link rel="apple-touch-icon" href="/typo3conf/ext/ep_theme/Resources/Public/images/apple-touch-icon-144x144.png" sizes="144x144">
+<link rel="apple-touch-icon" href="/typo3conf/ext/ep_theme/Resources/Public/images/apple-touch-icon-152x152.png" sizes="152x152">
+<link rel="apple-touch-icon" href="/typo3conf/ext/ep_theme/Resources/Public/images/apple-touch-icon-180x180.png" sizes="180x180">
+<link rel="apple-touch-icon" href="/typo3conf/ext/ep_theme/Resources/Public/images/apple-touch-icon-precomposed.png">
+<link rel="icon" type="image/png" href="/typo3conf/ext/ep_theme/Resources/Public/images/favicon-16x16.png" sizes="16x16">
+<link rel="icon" type="image/png" href="/typo3conf/ext/ep_theme/Resources/Public/images/favicon-32x32.png" sizes="32x32">
+<link rel="icon" type="image/png" href="/typo3conf/ext/ep_theme/Resources/Public/images/favicon-96x96.png" sizes="96x96">
+<link rel="icon" type="image/png" href="/typo3conf/ext/ep_theme/Resources/Public/images/favicon-160x160.png" sizes="160x160">
+<link rel="icon" type="image/png" href="/typo3conf/ext/ep_theme/Resources/Public/images/favicon-192x192.png" sizes="192x192">
+<link rel="icon" type="image/png" href="/typo3conf/ext/ep_theme/Resources/Public/images/favicon-196x196.png" sizes="196x196">
+    )
 
     includeCSS {
         main = EXT:ep_theme/Resources/Public/css/main.css
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-114x114.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-114x114.png
new file mode 100644
index 00000000..456dedc8
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-114x114.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-120x120.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-120x120.png
new file mode 100644
index 00000000..0340efae
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-120x120.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-128x128.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-128x128.png
new file mode 100644
index 00000000..3ecb2f6f
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-128x128.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-144x144.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-144x144.png
new file mode 100644
index 00000000..11ce0107
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-144x144.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-152x152.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-152x152.png
new file mode 100644
index 00000000..4ec6242b
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-152x152.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-180x180.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-180x180.png
new file mode 100644
index 00000000..45abefb8
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-180x180.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-57x57.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-57x57.png
new file mode 100644
index 00000000..ad2c3a7a
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-57x57.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-60x60.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-60x60.png
new file mode 100644
index 00000000..c07c9ba3
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-60x60.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-72x72.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-72x72.png
new file mode 100644
index 00000000..b065b753
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-72x72.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-76x76.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-76x76.png
new file mode 100644
index 00000000..3f32e543
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-76x76.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-precomposed.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-precomposed.png
new file mode 100644
index 00000000..ad2c3a7a
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon-precomposed.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon.png
new file mode 100644
index 00000000..c07c9ba3
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/apple-touch-icon.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-160x160.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-160x160.png
new file mode 100644
index 00000000..60bd68f9
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-160x160.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-16x16.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-16x16.png
new file mode 100644
index 00000000..ee7fb61b
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-16x16.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-192x192.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-192x192.png
new file mode 100644
index 00000000..962223c6
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-192x192.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-196x196.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-196x196.png
new file mode 100644
index 00000000..d456d0db
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-196x196.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-32x32.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-32x32.png
new file mode 100644
index 00000000..994f5b3f
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-32x32.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-96x96.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-96x96.png
new file mode 100644
index 00000000..d800b722
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon-96x96.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon.gif b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon.gif
new file mode 100644
index 00000000..73a65f84
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon.gif differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon.ico b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon.ico
new file mode 100644
index 00000000..34834344
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon.ico differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon.png b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon.png
new file mode 100644
index 00000000..34c45044
Binary files /dev/null and b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/images/icons/favicon.png differ
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js
index 165ddd6f..ac394832 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Assets/js/_images.js
@@ -4,7 +4,6 @@
 require('../images/bg_login.jpg');
 require('../images/logo.svg');
 require('../images/logo_wide.svg');
-require('../images/favicon_ep.ico');
 require('../images/at.png');
 require('../images/ch.png');
 require('../images/de.png');
@@ -13,6 +12,28 @@ require('../images/gb.png');
 require('../images/badge_skipass.png');
 require('../images/polygon.jpg');
 
+require('../images/icons/apple-touch-icon.png');
+require('../images/icons/apple-touch-icon-57x57.png');
+require('../images/icons/apple-touch-icon-60x60.png');
+require('../images/icons/apple-touch-icon-72x72.png');
+require('../images/icons/apple-touch-icon-76x76.png');
+require('../images/icons/apple-touch-icon-114x114.png');
+require('../images/icons/apple-touch-icon-120x120.png');
+require('../images/icons/apple-touch-icon-128x128.png');
+require('../images/icons/apple-touch-icon-144x144.png');
+require('../images/icons/apple-touch-icon-152x152.png');
+require('../images/icons/apple-touch-icon-180x180.png');
+require('../images/icons/apple-touch-icon-precomposed.png');
+require('../images/icons/favicon.gif');
+require('../images/icons/favicon.ico');
+require('../images/icons/favicon.png');
+require('../images/icons/favicon-16x16.png');
+require('../images/icons/favicon-32x32.png');
+require('../images/icons/favicon-96x96.png');
+require('../images/icons/favicon-160x160.png');
+require('../images/icons/favicon-192x192.png');
+require('../images/icons/favicon-196x196.png');
+
 require('../images/icons/icon_ce.svg');
 require('../images/icons/icon_select.png');
 require('../images/icons/tx_eptheme_domain_model_lineup.gif');