diff --git a/daemon.py b/daemon.py
index 4d047f44..3a7fb640 100644
--- a/daemon.py
+++ b/daemon.py
@@ -4382,8 +4382,12 @@ class PubServer(BaseHTTPRequestHandler):
             if 'image/avif' in self.headers['Accept']:
                 favType = 'image/avif'
                 favFilename = 'favicon.avif'
+        themeName = getConfigParam(baseDir, 'theme')
+        if not themeName:
+            themeName = 'default'
         # custom favicon
-        faviconFilename = baseDir + '/' + favFilename
+        faviconFilename = \
+            baseDir + '/theme/' + themeName + '/icons/' + favFilename
         if not os.path.isfile(faviconFilename):
             # default favicon
             faviconFilename = \
diff --git a/person.py b/person.py
index 76f3d31e..c0b624f6 100644
--- a/person.py
+++ b/person.py
@@ -483,6 +483,8 @@ def createPerson(baseDir: str, nickname: str, domain: str, port: int,
                  baseDir + '/accounts/' + nickname + '@' + domain +
                  '/avatar.png')
     theme = getConfigParam(baseDir, 'theme')
+    if not theme:
+        theme = 'default'
     defaultProfileImageFilename = baseDir + '/img/image.png'
     if theme:
         if os.path.isfile(baseDir + '/img/image_' + theme + '.png'):