diff --git a/daemon.py b/daemon.py
index e3ab45015..e02d1909f 100644
--- a/daemon.py
+++ b/daemon.py
@@ -4569,10 +4569,11 @@ class PubServer(BaseHTTPRequestHandler):
         if not self.server.themeName:
             self.themeName = getConfigParam(baseDir, 'theme')
         if not self.server.themeName:
-            themeName = 'default'
+            self.server.themeName = 'default'
         # custom favicon
         faviconFilename = \
-            baseDir + '/theme/' + self.server.themeName + '/icons/' + favFilename
+            baseDir + '/theme/' + self.server.themeName + \
+            '/icons/' + favFilename
         if not os.path.isfile(faviconFilename):
             # default favicon
             faviconFilename = \
diff --git a/webapp_utils.py b/webapp_utils.py
index 4aa599148..9119fc743 100644
--- a/webapp_utils.py
+++ b/webapp_utils.py
@@ -394,12 +394,6 @@ def getIconsWebPath(baseDir: str) -> str:
     """Returns the web path where icons exist
     """
     return 'icons'
-#    iconsPath = 'icons'
-#    theme = getConfigParam(baseDir, 'theme')
-#    if theme:
-#        if os.path.isdir(baseDir + '/theme/' + theme + '/icons'):
-#            iconsPath = 'icons/' + theme
-#    return iconsPath
 
 
 def scheduledPostsExist(baseDir: str, nickname: str, domain: str) -> bool: