diff --git a/configure.ac b/configure.ac
index 1693b8fa2..55a485e2c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -456,6 +456,7 @@ data/weather/Makefile
 data/webradio/Makefile
 data/webtv/Makefile
 data/y-web/Makefile
+data/y-web/favicon/Makefile
 data/y-web/images/Makefile
 data/y-web/info/Makefile
 data/y-web/jquery/Makefile
diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am
index 6367cd4bf..adae0ac24 100644
--- a/data/y-web/Makefile.am
+++ b/data/y-web/Makefile.am
@@ -1,7 +1,7 @@
 SUBDIRS = images scripts languages styles
 
 # NI-yWeb
-SUBDIRS += info jquery
+SUBDIRS += favicon info jquery
 
 installdir = $(PRIVATE_HTTPDDIR)
 
diff --git a/data/y-web/favicon/Makefile.am b/data/y-web/favicon/Makefile.am
new file mode 100644
index 000000000..871de4808
--- /dev/null
+++ b/data/y-web/favicon/Makefile.am
@@ -0,0 +1,12 @@
+installdir = $(PRIVATE_HTTPDDIR)/favicon
+
+install_DATA =	\
+	android-chrome-192x192.png \
+	android-chrome-512x512.png \
+	apple-touch-icon.png \
+	browserconfig.xml \
+	favicon-16x16.png \
+	favicon-32x32.png \
+	favicon.ico \
+	mstile-150x150.png \
+	safari-pinned-tab.svg
diff --git a/data/y-web/info/android-chrome-192x192.png b/data/y-web/favicon/android-chrome-192x192.png
similarity index 100%
rename from data/y-web/info/android-chrome-192x192.png
rename to data/y-web/favicon/android-chrome-192x192.png
diff --git a/data/y-web/info/android-chrome-512x512.png b/data/y-web/favicon/android-chrome-512x512.png
similarity index 100%
rename from data/y-web/info/android-chrome-512x512.png
rename to data/y-web/favicon/android-chrome-512x512.png
diff --git a/data/y-web/info/apple-touch-icon.png b/data/y-web/favicon/apple-touch-icon.png
similarity index 100%
rename from data/y-web/info/apple-touch-icon.png
rename to data/y-web/favicon/apple-touch-icon.png
diff --git a/data/y-web/info/browserconfig.xml b/data/y-web/favicon/browserconfig.xml
similarity index 73%
rename from data/y-web/info/browserconfig.xml
rename to data/y-web/favicon/browserconfig.xml
index 4e26159c7..845d60dba 100644
--- a/data/y-web/info/browserconfig.xml
+++ b/data/y-web/favicon/browserconfig.xml
@@ -2,7 +2,7 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="/mstile-150x150.png"/>
+            <square150x150logo src="/favicon/mstile-150x150.png"/>
             <TileColor>#212121</TileColor>
         </tile>
     </msapplication>
diff --git a/data/y-web/info/favicon-16x16.png b/data/y-web/favicon/favicon-16x16.png
similarity index 100%
rename from data/y-web/info/favicon-16x16.png
rename to data/y-web/favicon/favicon-16x16.png
diff --git a/data/y-web/info/favicon-32x32.png b/data/y-web/favicon/favicon-32x32.png
similarity index 100%
rename from data/y-web/info/favicon-32x32.png
rename to data/y-web/favicon/favicon-32x32.png
diff --git a/data/y-web/info/favicon.ico b/data/y-web/favicon/favicon.ico
similarity index 100%
rename from data/y-web/info/favicon.ico
rename to data/y-web/favicon/favicon.ico
diff --git a/data/y-web/info/mstile-150x150.png b/data/y-web/favicon/mstile-150x150.png
similarity index 100%
rename from data/y-web/info/mstile-150x150.png
rename to data/y-web/favicon/mstile-150x150.png
diff --git a/data/y-web/info/safari-pinned-tab.svg b/data/y-web/favicon/safari-pinned-tab.svg
similarity index 100%
rename from data/y-web/info/safari-pinned-tab.svg
rename to data/y-web/favicon/safari-pinned-tab.svg
diff --git a/data/y-web/info/Makefile.am b/data/y-web/info/Makefile.am
index ff597148d..1f9950ec0 100644
--- a/data/y-web/info/Makefile.am
+++ b/data/y-web/info/Makefile.am
@@ -2,16 +2,5 @@ installdir = $(PRIVATE_HTTPDDIR)/info
 
 install_DATA = \
 	index.html \
-	yinfo.yhtm
-
-install_DATA +=	\
-	android-chrome-192x192.png \
-	android-chrome-512x512.png \
-	apple-touch-icon.png \
-	browserconfig.xml \
-	favicon-16x16.png \
-	favicon-32x32.png \
-	favicon.ico \
 	manifest.json \
-	mstile-150x150.png \
-	safari-pinned-tab.svg
+	yinfo.yhtm
diff --git a/data/y-web/info/manifest.json b/data/y-web/info/manifest.json
index f843c3c30..5880ec1a1 100644
--- a/data/y-web/info/manifest.json
+++ b/data/y-web/info/manifest.json
@@ -2,12 +2,12 @@
     "name": "NI - yInfo",
     "icons": [
         {
-            "src": "/android-chrome-192x192.png",
+            "src": "/favicon/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image/png"
         },
         {
-            "src": "/android-chrome-512x512.png",
+            "src": "/favicon/android-chrome-512x512.png",
             "sizes": "512x512",
             "type": "image/png"
         }
@@ -15,4 +15,4 @@
     "theme_color": "#212121",
     "background_color": "#212121",
     "display": "standalone"
-}
\ No newline at end of file
+}
diff --git a/data/y-web/info/yinfo.yhtm b/data/y-web/info/yinfo.yhtm
index 0344c6adf..e3b244de3 100644
--- a/data/y-web/info/yinfo.yhtm
+++ b/data/y-web/info/yinfo.yhtm
@@ -19,11 +19,11 @@
 {=include-block:Y_NI_Blocks.txt;head=}
 <meta http-equiv="refresh" content="15; URL=yinfo.yhtm">
 
-<link rel="apple-touch-icon" sizes="180x180" href="/info/apple-touch-icon.png">
-<link rel="icon" type="image/png" href="/info/favicon-32x32.png" sizes="32x32">
-<link rel="icon" type="image/png" href="/info/favicon-16x16.png" sizes="16x16">
-<link rel="manifest" href="/info/manifest.json">
-<link rel="mask-icon" href="/info/safari-pinned-tab.svg" color="#212121">
+<link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png">
+<link rel="icon" type="image/png" href="/favicon/favicon-32x32.png" sizes="32x32">
+<link rel="icon" type="image/png" href="/favicon/favicon-16x16.png" sizes="16x16">
+<link rel="mask-icon" href="/favicon/safari-pinned-tab.svg" color="#212121">
+<link rel="manifest" href="/favicon/manifest.json">
 <meta name="theme-color" content="#212121">
 
 <script type="text/javascript">