diff --git a/themes/tabi/sass/main.scss b/themes/tabi/sass/main.scss
index 16b6967..3a3bc36 100644
--- a/themes/tabi/sass/main.scss
+++ b/themes/tabi/sass/main.scss
@@ -196,7 +196,7 @@ article {
 }
 
 .section-title {
-    display: block;
+    display: flex;
     margin: 0;
     margin-top: -0.15em;
     color: var(--text-color-high-contrast);
diff --git a/themes/tabi/sass/parts/_misc.scss b/themes/tabi/sass/parts/_misc.scss
index 0580780..76b6ce2 100644
--- a/themes/tabi/sass/parts/_misc.scss
+++ b/themes/tabi/sass/parts/_misc.scss
@@ -48,6 +48,9 @@ ul {
 
 .title-container {
     padding-bottom: 8px;
+        .social {
+         margin-inline-start: 0.5rem;
+     }
 }
 
 .bottom-divider {
diff --git a/themes/tabi/templates/base.html b/themes/tabi/templates/base.html
index 899354a..582a72f 100644
--- a/themes/tabi/templates/base.html
+++ b/themes/tabi/templates/base.html
@@ -1,12 +1,13 @@
+{% import "macros/feed_utils.html" as feed_utils %}
 {% import "macros/format_date.html" as macros_format_date %}
 {% import "macros/list_posts.html" as macros_list_posts %}
 {% import "macros/page_header.html" as macros_page_header %}
 {% import "macros/rel_attributes.html" as macros_rel_attributes %}
+{% import "macros/series_page.html" as macros_series_page %}
 {% import "macros/settings.html" as macros_settings %}
 {% import "macros/table_of_contents.html" as macros_toc %}
-{% import "macros/translate.html" as macros_translate %}
-{% import "macros/series_page.html" as macros_series_page %}
 {% import "macros/target_attribute.html" as macros_target_attribute %}
+{% import "macros/translate.html" as macros_translate %}
 
 {# Load the internationalisation data for the current language from
 the .toml files in the user's '/i18n' folder, falling back to the theme's.
diff --git a/themes/tabi/templates/macros/feed_utils.html b/themes/tabi/templates/macros/feed_utils.html
new file mode 100644
index 0000000..7a649b8
--- /dev/null
+++ b/themes/tabi/templates/macros/feed_utils.html
@@ -0,0 +1,17 @@
+{#- Feed utility macros -#}
+ 
+ {#- Zola 0.19.0 uses `generate_feeds`. Prior versions use `generate_feed` -#}
+ {%- macro get_generate_feed() -%}
+     {{- config.generate_feeds | default(value=config.generate_feed) -}}
+ {%- endmacro get_generate_feed -%}
+ 
+ {%- macro get_feed_url() -%}
+     {{- config.feed_filenames[0] | default(value=(config.feed_filename)) -}}
+ {%- endmacro get_feed_url -%}
+ 
+ {#- Check footer feed icon conditions -#}
+ {%- macro should_show_footer_feed_icon() -%}
+     {%- set generate_feed = feed_utils::get_generate_feed() -%}
+     {%- set feed_url = feed_utils::get_feed_url() -%}
+     {{- generate_feed and config.extra.feed_icon and feed_url -}}
+ {%- endmacro should_show_footer_feed_icon -%}
diff --git a/themes/tabi/templates/macros/page_header.html b/themes/tabi/templates/macros/page_header.html
index 58a23dc..0d24999 100644
--- a/themes/tabi/templates/macros/page_header.html
+++ b/themes/tabi/templates/macros/page_header.html
@@ -1,5 +1,18 @@
-{% macro page_header(title) %}
+{% macro page_header(title, show_feed_icon=false) %}
+ 
+ {% set rel_attributes = macros_rel_attributes::rel_attributes() | trim %}
+ 
+ 
+ {%- set blank_target = macros_target_attribute::target_attribute(new_tab=config.markdown.external_links_target_blank) -%}
+ 
 <h1 class="title-container section-title bottom-divider">
-    {{ title }}
+      {{ title -}}
+     {% if show_feed_icon %}
+         {%- set feed_url = feed_utils::get_feed_url() -%}
+         <a class="no-hover-padding social" rel="{{ rel_attributes }}" {{ blank_target }} href="{{ get_url(path=term.path ~ feed_url, lang=lang, trailing_slash=false) | safe }}">
+             <img loading="lazy" alt="feed" title="feed" src="{{ get_url(path='/social_icons/rss.svg') }}">
+         </a>
+     {% endif %}
 </h1>
+
 {% endmacro page_header %}
diff --git a/themes/tabi/templates/partials/footer.html b/themes/tabi/templates/partials/footer.html
index 05c53fa..b52dd4f 100644
--- a/themes/tabi/templates/partials/footer.html
+++ b/themes/tabi/templates/partials/footer.html
@@ -5,11 +5,8 @@
 {%- set blank_target = macros_target_attribute::target_attribute(new_tab=config.markdown.external_links_target_blank) -%}
 
 {#- Feed icon -#}
-{#- Zola 0.19.0 uses `generate_feeds`. Prior versions use `generate_feed` -#}
-{%- set generate_feed = config.generate_feeds | default(value=config.generate_feed) -%}
-{%- set feed_url = config.feed_filenames[0] | default(value=(config.feed_filename)) -%}
-{%- set should_show_feed = generate_feed and config.extra.feed_icon and feed_url -%}
-
+{%- set feed_url = feed_utils::get_feed_url() -%}
+{%- set should_show_feed = feed_utils::should_show_footer_feed_icon() -%}
 {%- set should_show_footer_icons = should_show_feed or config.extra.socials or config.extra.email -%}
 
 <footer>
diff --git a/themes/tabi/templates/tags/single.html b/themes/tabi/templates/tags/single.html
index 29d6158..341759d 100644
--- a/themes/tabi/templates/tags/single.html
+++ b/themes/tabi/templates/tags/single.html
@@ -2,7 +2,13 @@
 
 {% block main_content %}
 
-{{ macros_page_header::page_header(title=term.name) }}
+{#- Feed icon -#}
+ {%- set generate_feed = feed_utils::get_generate_feed() -%}
+ {%- set feed_url = feed_utils::get_feed_url() -%}
+ {%- set feed_pre_conditions = generate_feed and feed_url and taxonomy.feed -%}
+ {%- set show_feed_icon = feed_pre_conditions and term.pages | filter(attribute="date") -%}
+ 
+ {{ macros_page_header::page_header(title=term.name, show_feed_icon=show_feed_icon) }}
 
 {% set max = section.extra.max_posts | default(value=999999) %}
 {{ macros_list_posts::list_posts(posts=term.pages, max=max, language_strings=language_strings) }}
diff --git a/themes/tabi/templates/taxonomy_single.html b/themes/tabi/templates/taxonomy_single.html
index bce132a..cf119d2 100644
--- a/themes/tabi/templates/taxonomy_single.html
+++ b/themes/tabi/templates/taxonomy_single.html
@@ -2,7 +2,14 @@
 
 {% block main_content %}
 
-{{ macros_page_header::page_header(title=term.name) }}
+
+{#- Feed icon -#}
+ {%- set generate_feed = feed_utils::get_generate_feed() -%}
+ {%- set feed_url = feed_utils::get_feed_url() -%}
+ {%- set feed_pre_conditions = generate_feed and feed_url and taxonomy.feed -%}
+ {%- set show_feed_icon = feed_pre_conditions and term.pages | filter(attribute="date") | length > 0 -%}
+ 
+ {{ macros_page_header::page_header(title=term.name, show_feed_icon=show_feed_icon) }}
 
 {% set max = section.extra.max_posts | default(value=999999) %}
 {{ macros_list_posts::list_posts(posts=term.pages, max=max, language_strings=language_strings) }}