diff --git a/surface/surfapp/templates/admin/base.html b/surface/surfapp/templates/admin/base.html
index e98d87dd..dc4bad54 100644
--- a/surface/surfapp/templates/admin/base.html
+++ b/surface/surfapp/templates/admin/base.html
@@ -13,23 +13,6 @@
         <div id="main" class="bg-white flex flex-col grow min-w-0 dark:bg-base-900 {% element_classes 'main' %}">
             {% include "unfold/helpers/header.html" %}
 
-            {% if not is_popup %}
-                {% spaceless %}
-                    {% block breadcrumbs %}
-                        <div class="px-4">
-                            <div class="container mb-12 mx-auto -my-3">
-                                <ul class="flex flex-wrap">
-                                    {% url 'admin:index' as link %}
-                                    {% trans 'Home' as name %}
-                                    {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=name %}
-                                    {% block custom_breadcrumbs %}{% endblock %}
-                                </ul>
-                            </div>
-                        </div>
-                    {% endblock %}
-                {% endspaceless %}
-            {% endif %}
-
             {% block messages %}
                 <div class="px-4">
                     <div class="{% if not cl.model_admin.list_fullwidth %}container{% endif %} mx-auto">
diff --git a/surface/surfapp/templates/admin/change_list.html b/surface/surfapp/templates/admin/change_list.html
index aa3d1c2a..c1bc6dee 100644
--- a/surface/surfapp/templates/admin/change_list.html
+++ b/surface/surfapp/templates/admin/change_list.html
@@ -28,26 +28,6 @@
 
 {% block bodyclass %}{{ block.super }} app-{{ opts.app_label }} model-{{ opts.model_name }} change-list{% endblock %}
 
-{% if not is_popup %}
-    {% block breadcrumbs %}
-        <div class="px-4">
-            <div class="{% if not cl.model_admin.list_fullwidth %}container{% endif %} mb-6 mx-auto -my-3 lg:mb-12">
-                <ul class="flex flex-wrap">
-                    {% url 'admin:index' as link %}
-                    {% trans 'Home' as name %}
-                    {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=name %}
-
-                    {% url 'admin:app_list' app_label=cl.opts.app_label as link %}
-                    {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=cl.opts.app_config.verbose_name %}
-
-                    {% url opts|admin_urlname:'changelist' as link %}
-                    {% include 'unfold/helpers/breadcrumb_item.html' with link=link name=cl.opts.verbose_name_plural|capfirst no_separator=True %}
-                </ul>
-            </div>
-        </div>
-    {% endblock %}
-{% endif %}
-
 {% block coltype %}{% endblock %}
 
 {% block nav-global-side %}
diff --git a/surface/surfapp/templates/unfold/helpers/header.html b/surface/surfapp/templates/unfold/helpers/header.html
deleted file mode 100644
index b61097d7..00000000
--- a/surface/surfapp/templates/unfold/helpers/header.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% load unfold %}
-{% if not is_popup %}
-    {% block header %}
-        <div class="bg-white border-b border-base-200 mb-6 px-4 z-40 dark:bg-base-900 dark:border-base-800 dark:text-font-default-dark {% element_classes 'header' %} sticky top-0">
-            <div class="{% if not cl.model_admin.list_fullwidth %}container{% endif %} flex items-center h-16 mx-auto py-4">
-                <div id="header-inner" class="flex items-center w-full">
-                    <div class="flex items-center w-full justify-between">
-                        <div class="flex items-center gap-4">
-                            {% block usertools %}
-                                {% if has_permission %}
-                                    {% block welcome-msg %}
-                                        {% include 'unfold/helpers/welcomemsg.html' %}
-                                    {% endblock %}
-                                    {% component "unfold/components/navigation.html" with items=navigation %}{% endcomponent %}
-                                {% endif %}
-                            {% endblock %}
-                        </div>
-                        <div class="flex items-center gap-4">
-                            {% block userlinks %}
-                                {% include 'unfold/helpers/userlinks.html' %}
-                            {% endblock %}
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    {% endblock %}
-{% endif %}
\ No newline at end of file
diff --git a/surface/surfapp/templates/unfold/helpers/header_title.html b/surface/surfapp/templates/unfold/helpers/header_title.html
new file mode 100644
index 00000000..a38a3883
--- /dev/null
+++ b/surface/surfapp/templates/unfold/helpers/header_title.html
@@ -0,0 +1,25 @@
+{% load i18n admin_urls %}
+{% spaceless %}
+    {% url 'admin:index' as admin_index_url %}
+    {% if not request or request.path != admin_index_url %}
+        <a href="{{ admin_index_url }}" class="align-middle inline-block leading-5 tracking-tight">
+            {% translate "Home" %}
+        </a>
+
+        {% if parts %}
+            <span class="material-symbols-outlined inline-block align-middle leading-5 mx-2 text-base-400 dark:text-base-500">chevron_right</span>
+        {% endif %}
+    {% endif %}
+
+    {% if parts %}
+        {% for part in parts %}
+            <{% if part.link %}a href="{{ part.link }}"{% else %}span{% endif %} class="align-middle inline-block leading-5 tracking-tight">
+            {{ part.title|capfirst }}
+            </{% if part.link %}a{% else %}span{% endif %} >
+
+            {% if not forloop.last %}
+                <span class="material-symbols-outlined inline-block align-middle leading-5 mx-2 text-base-400 dark:text-base-500">chevron_right</span>
+            {% endif %}
+        {% endfor %}
+    {% endif %}
+{% endspaceless %}
\ No newline at end of file
diff --git a/surface/surfapp/templates/unfold/helpers/welcomemsg.html b/surface/surfapp/templates/unfold/helpers/welcomemsg.html
deleted file mode 100644
index e864514d..00000000
--- a/surface/surfapp/templates/unfold/helpers/welcomemsg.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% load unfold i18n %}
-
-<div class="flex flex-row grow font-semibold items-center min-w-0 mr-3">
-    {% if is_nav_sidebar_enabled %}
-        <span class="cursor-pointer flex flex-row items-center">
-            <span class="material-symbols-outlined hidden! xl:block!" hx-get="{% url "admin:toggle_sidebar" %}" hx-swap="none" x-on:click="sidebarDesktopOpen = !sidebarDesktopOpen">
-                dock_to_right
-            </span>
-
-            <span class="material-symbols-outlined block! xl:hidden!" x-on:click="sidebarMobileOpen = !sidebarMobileOpen">
-                dock_to_right
-            </span>
-        </span>
-    {% endif %}
-
-    <span class="block bg-base-200 h-5 mx-3 w-px dark:bg-base-700"></span>
-
-    {% include "unfold/helpers/header_back_button.html" %}
-
-    <h1 class="overflow-hidden text-ellipsis text-sm whitespace-nowrap xl:text-base text-font-important-light dark:text-font-important-dark">
-        {% if content_title %}
-            <span class="tracking-tight">
-                {{ pretitle }}
-
-                {{ content_title }}
-            </span>
-
-            {% if cl and cl.full_result_count != cl.result_count and cl.paginator|class_name != "InfinitePaginator" %}
-                <span class="font-medium ml-2 text-font-subtle-light text-sm dark:text-font-subtle-dark">
-                    {% blocktranslate count counter=cl.result_count %}{{ counter }} result{% plural %}{{ counter }} results{% endblocktranslate %} (<a href="?{% if cl.is_popup %}_popup=1{% endif %}">{% if cl.show_full_result_count %}{% blocktranslate with full_result_count=cl.full_result_count %}{{ full_result_count }} total{% endblocktranslate %}{% else %}{% translate "Show all" %}{% endif %}</a>)
-                </span>
-            {% endif %}
-
-            {% if content_subtitle %}
-                {{ content_subtitle }}
-            {% endif %}
-        {% endif %}
-    </h1>
-</div>
\ No newline at end of file