diff --git a/src/_h5ai/client/images/blank.svg b/src/_h5ai/client/images/blank.svg
deleted file mode 100644
index e0423172..00000000
--- a/src/_h5ai/client/images/blank.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg id="svg7384" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/">
- <metadata id="metadata90">
-  <rdf:RDF>
-   <cc:Work rdf:about="">
-    <dc:format>image/svg+xml</dc:format>
-    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
-    <dc:title>Gnome Symbolic Icon Theme</dc:title>
-   </cc:Work>
-  </rdf:RDF>
- </metadata>
- <title id="title9167">Gnome Symbolic Icon Theme</title>
-</svg>
diff --git a/src/_h5ai/client/images/app-114x114.png b/src/_h5ai/client/images/favicon/app-114.png
similarity index 100%
rename from src/_h5ai/client/images/app-114x114.png
rename to src/_h5ai/client/images/favicon/app-114.png
diff --git a/src/_h5ai/client/images/app-144x144.png b/src/_h5ai/client/images/favicon/app-144.png
similarity index 100%
rename from src/_h5ai/client/images/app-144x144.png
rename to src/_h5ai/client/images/favicon/app-144.png
diff --git a/src/_h5ai/client/images/app-16x16.ico b/src/_h5ai/client/images/favicon/app-16.ico
similarity index 100%
rename from src/_h5ai/client/images/app-16x16.ico
rename to src/_h5ai/client/images/favicon/app-16.ico
diff --git a/src/_h5ai/client/images/app-48x48.png b/src/_h5ai/client/images/favicon/app-48.png
similarity index 100%
rename from src/_h5ai/client/images/app-48x48.png
rename to src/_h5ai/client/images/favicon/app-48.png
diff --git a/src/_h5ai/client/images/app-57x57.png b/src/_h5ai/client/images/favicon/app-57.png
similarity index 100%
rename from src/_h5ai/client/images/app-57x57.png
rename to src/_h5ai/client/images/favicon/app-57.png
diff --git a/src/_h5ai/client/images/app-72x72.png b/src/_h5ai/client/images/favicon/app-72.png
similarity index 100%
rename from src/_h5ai/client/images/app-72x72.png
rename to src/_h5ai/client/images/favicon/app-72.png
diff --git a/src/_h5ai/client/images/app.svg b/src/_h5ai/client/images/favicon/app.svg
similarity index 100%
rename from src/_h5ai/client/images/app.svg
rename to src/_h5ai/client/images/favicon/app.svg
diff --git a/src/_h5ai/index.html.jade b/src/_h5ai/index.html.jade
index ee42865e..a3f48010 100644
--- a/src/_h5ai/index.html.jade
+++ b/src/_h5ai/index.html.jade
@@ -11,12 +11,12 @@ html.no-js.browser( lang="en" )
 		title {{pkg.name}} {{pkg.version}} Server Setup
 		meta( name="description", content="{{pkg.name}} server details" )
 		meta( name="viewport", content="width=device-width" )
-		link( rel="shortcut icon", href="client/images/app-16x16.ico" )
-		link( rel="apple-touch-icon-precomposed", type="image/png", href="client/images/app-48x48.png" )
-		link( rel="apple-touch-icon-precomposed", sizes="57x57", type="image/png", href="client/images/app-57x57.png" )
-		link( rel="apple-touch-icon-precomposed", sizes="72x72", type="image/png", href="client/images/app-72x72.png" )
-		link( rel="apple-touch-icon-precomposed", sizes="114x114", type="image/png", href="client/images/app-114x114.png" )
-		link( rel="apple-touch-icon-precomposed", sizes="144x144", type="image/png", href="client/images/app-144x144.png" )
+		link( rel="shortcut icon", href="client/images/favicon/app-16.ico" )
+		link( rel="apple-touch-icon-precomposed", type="image/png", href="client/images/favicon/app-48.png" )
+		link( rel="apple-touch-icon-precomposed", sizes="57x57", type="image/png", href="client/images/favicon/app-57.png" )
+		link( rel="apple-touch-icon-precomposed", sizes="72x72", type="image/png", href="client/images/favicon/app-72.png" )
+		link( rel="apple-touch-icon-precomposed", sizes="114x114", type="image/png", href="client/images/favicon/app-114.png" )
+		link( rel="apple-touch-icon-precomposed", sizes="144x144", type="image/png", href="client/images/favicon/app-144.png" )
 		link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:300italic,700italic,300,700" )
 		link( rel="stylesheet", href="client/css/styles.css" )
 		script( src="client/js/scripts.js", data-mode="info" )
diff --git a/src/_h5ai/server/php/inc/page.php.jade b/src/_h5ai/server/php/inc/page.php.jade
index e75a9f16..d32a0f71 100644
--- a/src/_h5ai/server/php/inc/page.php.jade
+++ b/src/_h5ai/server/php/inc/page.php.jade
@@ -15,12 +15,12 @@ html.no-js.browser( lang="en" )
 		title index ยท styled with {{pkg.name}} {{pkg.version}} ({{pkg.url}})
 		meta( name="description", content="index styled with {{pkg.name}} {{pkg.version}} ({{pkg.url}})" )
 		meta( name="viewport", content="width=device-width" )
-		link( rel="shortcut icon", href!="#{app_href}client/images/app-16x16.ico" )
-		link( rel="apple-touch-icon-precomposed", type="image/png", href!="#{app_href}client/images/app-48x48.png" )
-		link( rel="apple-touch-icon-precomposed", sizes="57x57", type="image/png", href!="#{app_href}client/images/app-57x57.png" )
-		link( rel="apple-touch-icon-precomposed", sizes="72x72", type="image/png", href!="#{app_href}client/images/app-72x72.png" )
-		link( rel="apple-touch-icon-precomposed", sizes="114x114", type="image/png", href!="#{app_href}client/images/app-114x114.png" )
-		link( rel="apple-touch-icon-precomposed", sizes="144x144", type="image/png", href!="#{app_href}client/images/app-144x144.png" )
+		link( rel="shortcut icon", href!="#{app_href}client/images/favicon/app-16.ico" )
+		link( rel="apple-touch-icon-precomposed", type="image/png", href!="#{app_href}client/images/favicon/app-48.png" )
+		link( rel="apple-touch-icon-precomposed", sizes="57x57", type="image/png", href!="#{app_href}client/images/favicon/app-57.png" )
+		link( rel="apple-touch-icon-precomposed", sizes="72x72", type="image/png", href!="#{app_href}client/images/favicon/app-72.png" )
+		link( rel="apple-touch-icon-precomposed", sizes="114x114", type="image/png", href!="#{app_href}client/images/favicon/app-114.png" )
+		link( rel="apple-touch-icon-precomposed", sizes="144x144", type="image/png", href!="#{app_href}client/images/favicon/app-144.png" )
 		link( rel="stylesheet", href="//fonts.googleapis.com/css?family=Ubuntu+Mono:400,700,400italic,700italic|Ubuntu:300italic,700italic,300,700" )
 		link( rel="stylesheet", href!="#{app_href}client/css/styles.css" )
 		script( src!="#{app_href}client/js/scripts.js" )