diff --git a/blog.py b/blog.py
index d149b419..a3e56c3a 100644
--- a/blog.py
+++ b/blog.py
@@ -10,7 +10,6 @@ import os
 from datetime import datetime
 
 from content import replaceEmojiFromTags
-from webapp_utils import getIconsWebPath
 from webapp_utils import htmlHeaderWithExternalStyle, htmlHeaderWithExternalStyles
 from webapp_utils import htmlFooter
 from webapp_utils import getPostAttachmentsAsHtml
diff --git a/webapp_column_left.py b/webapp_column_left.py
index ab92f0bf..dbbdad6c 100644
--- a/webapp_column_left.py
+++ b/webapp_column_left.py
@@ -15,7 +15,6 @@ from webapp_utils import sharesTimelineJson
 from webapp_utils import htmlPostSeparator
 from webapp_utils import getLeftImageFile
 from webapp_utils import headerButtonsFrontScreen
-from webapp_utils import getIconsWebPath
 from webapp_utils import htmlHeaderWithExternalStyle, htmlHeaderWithExternalStyles
 from webapp_utils import htmlFooter
 from webapp_utils import getBannerFile
diff --git a/webapp_column_right.py b/webapp_column_right.py
index 41a32858..c5fd6e6c 100644
--- a/webapp_column_right.py
+++ b/webapp_column_right.py
@@ -23,7 +23,6 @@ from webapp_utils import htmlFooter
 from webapp_utils import getBannerFile
 from webapp_utils import htmlPostSeparator
 from webapp_utils import headerButtonsFrontScreen
-from webapp_utils import getIconsWebPath
 from webapp_headerbuttons import headerNewsTabs
 
 
diff --git a/webapp_frontscreen.py b/webapp_frontscreen.py
index daf4f274..802885c8 100644
--- a/webapp_frontscreen.py
+++ b/webapp_frontscreen.py
@@ -131,7 +131,6 @@ def htmlFrontScreen(rssIconAtTop: bool,
     # NOTE: Related also to class "page" added to 'webapp_create_post.py'
     profileHeaderStr += '<div class="timeline">\n'
 
-    iconsPath = getIconsWebPath(baseDir)
     leftColumnStr = \
         getLeftColumnContent(baseDir, 'news', domainFull,
                              httpPrefix, translate,
@@ -183,7 +182,6 @@ def htmlFrontScreen(rssIconAtTop: bool,
 
     # Footer which is only used for system accounts
 
-    iconsPath = getIconsWebPath(baseDir)
     rightColumnStr = \
         getRightColumnContent(baseDir, 'news', domainFull,
                               httpPrefix, translate,
diff --git a/webapp_profile.py b/webapp_profile.py
index 36e9f1b1..2f87e7d2 100644
--- a/webapp_profile.py
+++ b/webapp_profile.py
@@ -43,7 +43,6 @@ from follow import isFollowerOfPerson
 from webapp_frontscreen import htmlFrontScreen
 from webapp_utils import scheduledPostsExist
 from webapp_utils import getPersonAvatarUrl
-from webapp_utils import getIconsWebPath
 from webapp_utils import htmlHeaderWithExternalStyle, htmlHeaderWithExternalStyles
 from webapp_utils import htmlFooter
 from webapp_utils import addEmojiToDisplayName
diff --git a/webapp_timeline.py b/webapp_timeline.py
index 1561fc2d..3d0607f9 100644
--- a/webapp_timeline.py
+++ b/webapp_timeline.py
@@ -197,7 +197,10 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
     # start the timeline
     tlStr += '<div class="timeline">\n'
 
-    domainFull = getFullDomain(domain, port)
+    domainFull = domain
+    if port:
+        if port != 80 and port != 443:
+            domainFull = domain + ':' + str(port)
 
     # For 'News' instances, only show standard "buttons" on "user" pages
     if defaultTimeline == 'tlfeatures' and boxName in userPages:
@@ -214,7 +217,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
         # left column
         leftColumnStr = \
             getLeftColumnContent(baseDir, nickname, domainFull,
-                                 httpPrefix, translate, iconsPath,
+                                 httpPrefix, translate,
                                  editor, False, None, rssIconAtTop,
                                  True, False)
         tlStr += '  <div class="section links">\n' + \
@@ -407,7 +410,7 @@ def htmlTimeline(cssCache: {}, defaultTimeline: str,
     if defaultTimeline == 'tlfeatures' and boxName not in userPages:
         # right column
         rightColumnStr = getRightColumnContent(baseDir, nickname, domainFull,
-                                               httpPrefix, translate, iconsPath,
+                                               httpPrefix, translate,
                                                moderator, editor,
                                                newswire, positiveVoting,
                                                False, None, True,