diff --git a/config.toml b/config.toml
index d8b66cf..d6f3ce8 100644
--- a/config.toml
+++ b/config.toml
@@ -252,7 +252,7 @@ favicon_emoji = "🌱"
 # Can be set at page or section levels, following the hierarchy: page > section > config. See: https://welpo.github.io/tabi/blog/mastering-tabi-settings/#settings-hierarchy
 # Learn how to create these images in batch and automatically:
 # https://osc.garden/blog/automating-social-media-cards-zola/
-social_media_card = "social_cards/index.jpg"
+social_media_card = "index.jpg"
 
 menu = [
     { name = "blog", url = "blog", trailing_slash = true },
diff --git a/content/_index.ca.md b/content/_index.ca.md
index e6d85c6..b597c64 100644
--- a/content/_index.ca.md
+++ b/content/_index.ca.md
@@ -9,7 +9,7 @@ max_posts = 4
 projects_path = "projects/_index.ca.md"
 max_projects = 3
 show_projects_first = false
-social_media_card = "social_cards/ca.jpg"
+social_media_card = "ca.jpg"
 +++
 
 tabi és un tema de [Zola](https://www.getzola.org) ràpid, lleuger i modern. Té com a objectiu ser una pàgina personal i llar d'entrades de blog. Compta amb una puntuació perfecta de Lighthouse, disseny responsive, tema fosc i clar, shortcodes personalitzats i molt més.
diff --git a/content/_index.es.md b/content/_index.es.md
index 5781274..d476193 100644
--- a/content/_index.es.md
+++ b/content/_index.es.md
@@ -9,7 +9,7 @@ max_posts = 4
 projects_path = "projects/_index.es.md"
 max_projects = 3
 show_projects_first = false
-social_media_card = "social_cards/es.jpg"
+social_media_card = "es.jpg"
 +++
 
 tabi es un tema de [Zola](https://www.getzola.org) rápido, ligero y moderno. Su objetivo es ser una página personal y hogar para publicaciones de blogs. Cuenta con una puntuación perfecta en Lighthouse, diseño responsive, tema oscuro y claro, shortcodes personalizados y mucho más.
diff --git a/content/_index.md b/content/_index.md
index f2418f7..378e10b 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -9,7 +9,7 @@ max_posts = 4
 projects_path = "projects/_index.md"
 max_projects = 3
 show_projects_first = false
-social_media_card = "social_cards/index.jpg"
+social_media_card = "index.jpg"
 +++
 
 tabi is a fast, lightweight, and modern [Zola](https://www.getzola.org) theme. It aims to be a personal page and home to blog posts. It features a perfect Lighthouse score, responsive design, dark and light themes, custom shortcodes, and much more.
diff --git a/content/archive/_index.ca.md b/content/archive/_index.ca.md
index 984a17a..869b1d2 100644
--- a/content/archive/_index.ca.md
+++ b/content/archive/_index.ca.md
@@ -3,5 +3,5 @@ title = "Arxiu"
 template = "archive.html"
 
 [extra]
-social_media_card = "archive/social_cards/ca_archive.jpg"
+social_media_card = "ca_archive.jpg"
 +++
diff --git a/content/archive/_index.es.md b/content/archive/_index.es.md
index c7bca8f..9f33695 100644
--- a/content/archive/_index.es.md
+++ b/content/archive/_index.es.md
@@ -3,5 +3,5 @@ title = "Archivo"
 template = "archive.html"
 
 [extra]
-social_media_card = "archive/social_cards/es_archive.jpg"
+social_media_card = "es_archive.jpg"
 +++
diff --git a/content/archive/_index.md b/content/archive/_index.md
index dea9aab..10cf255 100644
--- a/content/archive/_index.md
+++ b/content/archive/_index.md
@@ -3,5 +3,5 @@ title = "Archive"
 template = "archive.html"
 
 [extra]
-social_media_card = "archive/social_cards/archive.jpg"
+social_media_card = "archive.jpg"
 +++
diff --git a/content/archive/social_cards/archive.jpg b/content/archive/archive.jpg
similarity index 100%
rename from content/archive/social_cards/archive.jpg
rename to content/archive/archive.jpg
diff --git a/content/archive/social_cards/ca_archive.jpg b/content/archive/ca_archive.jpg
similarity index 100%
rename from content/archive/social_cards/ca_archive.jpg
rename to content/archive/ca_archive.jpg
diff --git a/content/archive/social_cards/es_archive.jpg b/content/archive/es_archive.jpg
similarity index 100%
rename from content/archive/social_cards/es_archive.jpg
rename to content/archive/es_archive.jpg
diff --git a/content/blog/_index.ca.md b/content/blog/_index.ca.md
index e3e722c..25e0758 100644
--- a/content/blog/_index.ca.md
+++ b/content/blog/_index.ca.md
@@ -5,6 +5,6 @@ sort_by = "date"
 insert_anchor_links = "left"
 
 [extra]
-social_media_card = "blog/social_cards/ca_blog.jpg"
+social_media_card = "ca_blog.jpg"
 show_previous_next_article_links = true
 +++
diff --git a/content/blog/_index.es.md b/content/blog/_index.es.md
index cc48571..201c2d4 100644
--- a/content/blog/_index.es.md
+++ b/content/blog/_index.es.md
@@ -5,6 +5,6 @@ sort_by = "date"
 insert_anchor_links = "left"
 
 [extra]
-social_media_card = "blog/social_cards/es_blog.jpg"
+social_media_card = "es_blog.jpg"
 show_previous_next_article_links = true
 +++
diff --git a/content/blog/_index.md b/content/blog/_index.md
index 8f7a083..22dbcda 100644
--- a/content/blog/_index.md
+++ b/content/blog/_index.md
@@ -5,6 +5,6 @@ sort_by = "date"
 insert_anchor_links = "left"
 
 [extra]
-social_media_card = "blog/social_cards/blog.jpg"
+social_media_card = "blog.jpg"
 show_previous_next_article_links = true
 +++
diff --git a/content/blog/social_cards/blog.jpg b/content/blog/blog.jpg
similarity index 100%
rename from content/blog/social_cards/blog.jpg
rename to content/blog/blog.jpg
diff --git a/content/blog/social_cards/ca_blog.jpg b/content/blog/ca_blog.jpg
similarity index 100%
rename from content/blog/social_cards/ca_blog.jpg
rename to content/blog/ca_blog.jpg
diff --git a/content/blog/social_cards/es_blog.jpg b/content/blog/es_blog.jpg
similarity index 100%
rename from content/blog/social_cards/es_blog.jpg
rename to content/blog/es_blog.jpg
diff --git a/content/social_cards/ca.jpg b/content/ca.jpg
similarity index 100%
rename from content/social_cards/ca.jpg
rename to content/ca.jpg
diff --git a/content/social_cards/es.jpg b/content/es.jpg
similarity index 100%
rename from content/social_cards/es.jpg
rename to content/es.jpg
diff --git a/content/social_cards/index.jpg b/content/index.jpg
similarity index 100%
rename from content/social_cards/index.jpg
rename to content/index.jpg
diff --git a/content/pages/about/index.ca.md b/content/pages/about/index.ca.md
index 503fa84..4ecb30e 100644
--- a/content/pages/about/index.ca.md
+++ b/content/pages/about/index.ca.md
@@ -5,7 +5,6 @@ path = "/ca/about"
 
 [extra]
 quick_navigation_buttons = true
-social_media_card = "social_cards/about.ca.jpg"
 +++
 
 Benvingut a la demo de [**tabi**](https://github.com/welpo/tabi), un tema per a [Zola](https://www.getzola.org/), un generador de llocs web estàtics rapidíssim.
diff --git a/content/pages/about/index.es.md b/content/pages/about/index.es.md
index 005c336..8f74bef 100644
--- a/content/pages/about/index.es.md
+++ b/content/pages/about/index.es.md
@@ -5,7 +5,6 @@ path = "/es/about"
 
 [extra]
 quick_navigation_buttons = true
-social_media_card = "social_cards/about.es.jpg"
 +++
 
 Bienvenido a la demo de [**tabi**](https://github.com/welpo/tabi), un tema para [Zola](https://www.getzola.org/), un rapidísimo generador de sitios estáticos.
diff --git a/content/pages/about/index.md b/content/pages/about/index.md
index fba24f9..5db48c3 100644
--- a/content/pages/about/index.md
+++ b/content/pages/about/index.md
@@ -5,7 +5,6 @@ path = "about"
 
 [extra]
 quick_navigation_buttons = true
-social_media_card = "social_cards/about.jpg"
 +++
 
 Welcome to the demo of [**tabi**](https://github.com/welpo/tabi), a theme for [Zola](https://www.getzola.org/), a fast static site generator.
diff --git a/content/pages/about/social_cards/about.ca.jpg b/content/pages/about/social_cards/about.ca.jpg
deleted file mode 100644
index 6104cdc..0000000
Binary files a/content/pages/about/social_cards/about.ca.jpg and /dev/null differ
diff --git a/content/pages/about/social_cards/about.es.jpg b/content/pages/about/social_cards/about.es.jpg
deleted file mode 100644
index 809bd3a..0000000
Binary files a/content/pages/about/social_cards/about.es.jpg and /dev/null differ
diff --git a/content/pages/about/social_cards/about.jpg b/content/pages/about/social_cards/about.jpg
deleted file mode 100644
index 4117d18..0000000
Binary files a/content/pages/about/social_cards/about.jpg and /dev/null differ
diff --git a/templates/partials/social_media_images.html b/templates/partials/social_media_images.html
index a086ce7..d29e8f3 100644
--- a/templates/partials/social_media_images.html
+++ b/templates/partials/social_media_images.html
@@ -1,16 +1,25 @@
 {# Image for social media sharing #}
 {%- set social_media_card = macros_settings::evaluate_setting_priority(setting="social_media_card", page=page | default(value=""), section=section | default(value=""), default_global_value="") -%}
 {% if social_media_card %}
-    {# Try to find the image in current page, parent directories, and as absolute path #}
-    {% set page_path = page.colocated_path | default(value="") %}
-    {% set current_path = page_path ~ social_media_card %}
+    {# Get base path from either page or section #}
+    {% set base_path = "" %}
+    {% if section and section.path %}
+        {% set base_path = section.path | trim_end_matches(pat="/_index.md") %}
+        {% if base_path and not social_media_card is starting_with("/") %}
+            {% set base_path = base_path ~ "/" %}
+        {% endif %}
+    {% else %}
+        {% set base_path = page.colocated_path | default(value="") %}
+    {% endif %}
+
+    {% set current_path = base_path ~ social_media_card | trim_start_matches(pat="/") %}
 
     {# Try parent path by removing the last directory component #}
-    {% set parent_path = page_path | split(pat="/") | slice(end=-2) | join(sep="/") %}
-    {% if parent_path %}
+    {% set parent_path = base_path | split(pat="/") | slice(end=-2) | join(sep="/") %}
+    {% if parent_path and not social_media_card is starting_with("/") %}
         {% set parent_path = parent_path ~ "/" %}
     {% endif %}
-    {% set parent_relative_path = parent_path ~ social_media_card %}
+    {% set parent_relative_path = parent_path ~ social_media_card | trim_start_matches(pat="/") %}
 
     {# Check all possible locations #}
     {%- set current_meta = get_image_metadata(path=current_path, allow_missing=true) -%}