diff --git a/app/templates/admin/communities.html b/app/templates/admin/communities.html
index af65ec8f..07eaa64a 100644
--- a/app/templates/admin/communities.html
+++ b/app/templates/admin/communities.html
@@ -31,9 +31,7 @@
             {% for community in communities.items %}
                 <tr>
                     <td><a href="/c/{{ community.link() }}">{{ community.name }}</a></td>
-                    <td><a href="/c/{{ community.link() }}">
-                            <img src="{{ community.icon_image('tiny') }}" class="community_icon rounded-circle" loading="lazy" />
-                            {{ community.display_name() }}{% if community.banned %} (banned){% endif %}</a></td>
+                    <td>{{ render_communityname(community) }}{% if community.banned %} (banned){% endif %}</td>
                     <td>{{ community.topic.name  }}</td>
                     <td>{{ community.post_count  }}</td>
                     <th>{{ '&check;'|safe if community.show_home else '&cross;'|safe }}</th>
@@ -67,4 +65,4 @@
     </div>
 </div>
 <hr />
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/app/templates/base.html b/app/templates/base.html
index 77b984ba..f1dc6102 100644
--- a/app/templates/base.html
+++ b/app/templates/base.html
@@ -26,6 +26,16 @@
     {% endif -%}
 </span>
 {% endmacro -%}
+{% macro render_communityname(community) -%}
+    <span class="render_community">
+        <a href="/c/{{ community.link() }}" aria-label="{{ _('Go to community %(name)s', name=community.name) }}">
+            {% if community.icon_id and not low_bandwidth and not collapsed -%}
+                <img src="{{ community.icon_image() }}" class="community_icon rounded-circle" alt="" loading="lazy" />
+            {% endif -%}
+            c/{{ community.display_name() }}
+        </a>
+    </span>
+{% endmacro -%}
 <!doctype html>
 <html lang="en">
   <head>
diff --git a/app/templates/community/add_remote.html b/app/templates/community/add_remote.html
index f756d0b3..3e61544a 100644
--- a/app/templates/community/add_remote.html
+++ b/app/templates/community/add_remote.html
@@ -25,8 +25,7 @@
                             <div class="card-title">{{ _('Found a community:') }}</div>
                             <div class="card-body">
                                 <p>
-                                    <a href="/c/{{ new_community.link() }}"><img src="{{ new_community.icon_image()}}" class="community_icon rounded-circle" style="width: 30px; vertical-align: middle;" /></a>
-                                    <a href="/c/{{ new_community.link() }}">{{ new_community.title }}@{{ new_community.ap_domain }}</a>
+                                    {{ render_communityname(new_community) }}
                                 </p>
                                 <p> {% if subscribed %}
                                         <a class="btn btn-primary mt-4" href="/community/{{ new_community.link() }}/unsubscribe">{{ _('Leave') }}</a>
diff --git a/app/templates/community/community.html b/app/templates/community/community.html
index 28cb16cf..38b6b8f4 100644
--- a/app/templates/community/community.html
+++ b/app/templates/community/community.html
@@ -170,9 +170,7 @@
                 <ul class="list-group list-group-flush">
                     {% for community in related_communities -%}
                         <li class="list-group-item">
-                            <a href="/c/{{ community.link() }}" aria-label="{{ _('Go to community') }}"><img src="{{ community.icon_image() }}" class="community_icon rounded-circle" loading="lazy" alt="" />
-                                {{ community.display_name() }}
-                            </a>
+                            {{ render_communityname(community) }}
                         </li>
                     {% endfor -%}
                 </ul>
diff --git a/app/templates/community/lookup_remote.html b/app/templates/community/lookup_remote.html
index 074204da..08fd524e 100644
--- a/app/templates/community/lookup_remote.html
+++ b/app/templates/community/lookup_remote.html
@@ -14,8 +14,7 @@
                             <div class="card-title">{{ _('Found a community:') }}</div>
                             <div class="card-body">
                                 <p>
-                                    <a href="/c/{{ new_community.link() }}"><img src="{{ new_community.icon_image()}}" class="community_icon rounded-circle" style="width: 30px; vertical-align: middle;" /></a>
-                                    <a href="/c/{{ new_community.link() }}">{{ new_community.title }}@{{ new_community.ap_domain }}</a>
+                                    {{ render_communityname(new_community) }}
                                 </p>
                                 <p> {% if subscribed %}
                                         <a class="btn btn-primary mt-4" href="/community/{{ new_community.link() }}/unsubscribe">{{ _('Leave') }}</a>
diff --git a/app/templates/index.html b/app/templates/index.html
index 23b326b6..2e8798bf 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -53,9 +53,7 @@
                 <ul class="list-group list-group-flush">
                     {% for community in active_communities %}
                         <li class="list-group-item">
-                            <a href="/c/{{ community.link() }}"><img src="{{ community.icon_image() }}" class="community_icon rounded-circle" loading="lazy" alt="" />
-                                {{ community.display_name() }}
-                            </a>
+                            {{ render_communityname(community) }}
                         </li>
                     {% endfor %}
                 </ul>
diff --git a/app/templates/post/post.html b/app/templates/post/post.html
index e14c3aa3..5af93bf1 100644
--- a/app/templates/post/post.html
+++ b/app/templates/post/post.html
@@ -193,9 +193,7 @@
                 <ul class="list-group list-group-flush">
                     {% for community in related_communities -%}
                         <li class="list-group-item">
-                            <a href="/c/{{ community.link() }}" aria-label="{{ _('Go to community') }}"><img src="{{ community.icon_image() }}" class="community_icon rounded-circle" loading="lazy" alt="" />
-                                {{ community.display_name() }}
-                            </a>
+                            {{ render_communityname(community) }}
                         </li>
                     {% endfor -%}
                 </ul>
diff --git a/app/templates/search/results.html b/app/templates/search/results.html
index bced2814..95f5bfdd 100644
--- a/app/templates/search/results.html
+++ b/app/templates/search/results.html
@@ -51,9 +51,7 @@
                 <ul class="list-group list-group-flush">
                     {% for community in active_communities %}
                         <li class="list-group-item">
-                            <a href="/c/{{ community.link() }}"><img src="{{ community.icon_image() }}" class="community_icon rounded-circle" loading="lazy" alt="" />
-                                {{ community.display_name() }}
-                            </a>
+                            {{ render_communityname(community) }}
                         </li>
                     {% endfor %}
                 </ul>
diff --git a/app/templates/topic/show_topic.html b/app/templates/topic/show_topic.html
index de8761fd..b41b5b1a 100644
--- a/app/templates/topic/show_topic.html
+++ b/app/templates/topic/show_topic.html
@@ -92,9 +92,7 @@
                 <ul class="list-group list-group-flush">
                     {% for community in topic_communities %}
                         <li class="list-group-item">
-                            <a href="/c/{{ community.link() }}" aria-label="{{ _('Go to community') }}"><img src="{{ community.icon_image() }}" class="community_icon rounded-circle" loading="lazy" alt="" />
-                                {{ community.display_name() }}
-                            </a>
+                            {{ render_communityname(community) }}
                         </li>
                     {% endfor %}
                 </ul>
diff --git a/app/templates/user/notifications.html b/app/templates/user/notifications.html
index 3df7c3a4..a6596542 100644
--- a/app/templates/user/notifications.html
+++ b/app/templates/user/notifications.html
@@ -71,7 +71,7 @@
                         <ul>
                             {% for community in subscribed %}
                                 <li>
-                                    <a href="/c/{{ community.link() }}"><img src="{{ community.icon_image() }}" class="community_icon rounded-circle" loading="lazy" />{{ community.display_name() }}</a>
+                                    {{ render_communityname(community) }}
                                 </li>
                             {% endfor %}
                         </ul>
@@ -81,7 +81,7 @@
                         <ul>
                             {% for community in moderates %}
                                 <li>
-                                    <a href="/c/{{ community.link() }}"><img src="{{ community.icon_image() }}" class="community_icon rounded-circle" loading="lazy" />{{ community.display_name() }}</a>
+                                    {{ render_communityname(community) }}
                                 </li>
                             {% endfor %}
                         </ul>
diff --git a/app/templates/user/show_profile.html b/app/templates/user/show_profile.html
index 6caedee6..7d9ec758 100644
--- a/app/templates/user/show_profile.html
+++ b/app/templates/user/show_profile.html
@@ -171,7 +171,7 @@
                         <ul class="list-group list-group-flush">
                             {% for community in subscribed %}
                                 <li class="list-group-item">
-                                    <a href="/c/{{ community.link() }}"><img src="{{ community.icon_image() }}" class="community_icon rounded-circle" loading="lazy" />{{ community.display_name() }}</a>
+                                    {{ render_communityname(community) }}
                                 </li>
                             {% endfor %}
                         </ul>
@@ -181,7 +181,7 @@
                         <ul class="list-group list-group-flush">
                             {% for community in moderates %}
                                 <li class="list-group-item">
-                                    <a href="/c/{{ community.link() }}"><img src="{{ community.icon_image() }}" class="community_icon rounded-circle" loading="lazy" />{{ community.display_name() }}</a>
+                                    {{ render_communityname(community) }}
                                 </li>
                             {% endfor %}
                         </ul>
