diff --git a/src/app.scss b/src/app.scss
index 203a04c9..ca471551 100644
--- a/src/app.scss
+++ b/src/app.scss
@@ -44,10 +44,19 @@
     block-size: 100vh;
 }
 
-.pf-v5-c-page__main-breadcrumb {
+.files-overview-header {
     grid-area: topbar;
+
+    /* Chrome specific alignment issue */
+    align-items: center;
+
+    /* Override different background color from the <PageBreadCrumb> */
+    .pf-v5-c-page__main-breadcrumb {
+        background-color: unset
+    }
 }
 
+
 .pf-v5-c-sidebar__content > .pf-v5-c-card {
     grid-area: content;
 }
@@ -74,37 +83,64 @@
     @extend .ct-card;
 }
 
-// We have to override PatternFly assumptions, as PatternFly does not expect
-// widgets other than breadcrumbs within a breadcrumbs bar. We should probably
-// reparent these and separate the breadcrumb into its own widget on the top
-// bar instead.
-.pf-v5-c-page__main-breadcrumb {
-    .pf-v5-c-button:not(.breadcrumb-button):has(.pf-v5-svg:last-child) {
-        // PatternFly doesn't expect icons in buttons in breadcrumbs, so we need to adjust for that
-        >.pf-v5-c-button__icon {
-            margin-inline: 0;
+.files-overview-header {
+  gap: var(--pf-v5-global--spacer--sm);
+  display: flex;
+  /* Align page breadcrumb centered */
+  align-items: baseline;
+
+  /* Drop PF padding */
+  .pf-v5-c-page__main-breadcrumb {
+      padding: 0;
+      display: inline-block;
+  }
+
+  .pf-v5-c-breadcrumb {
+      margin-block: 0;
+      margin-inline: var(--pf-v5-global--spacer--sm);
+  }
+}
+
+.pf-v5-c-breadcrumb {
+    margin-block: 0;
+    margin-inline: var(--pf-v5-global--spacer--md);
+}
+
+.pf-v5-c-breadcrumb__list {
+    // Make sure all breadcrumb text is aligned properly, even if different heights (including icon)
+    align-items: baseline;
+
+    // Style the breadcrumb component as a path
+    .pf-v5-c-breadcrumb__item-divider {
+        > svg { 
+            display: none;
+        }
+
+        &::after { 
+            content: "/"; 
         }
     }
 
-    .pf-v5-c-menu-toggle {
-        padding-inline: var(--pf-v5-global--spacer--md) calc(var(--pf-v5-global--spacer--md) * 0.75);
+    .pf-v5-c-breadcrumb__item {
+        // Use the default font size, not the smaller size
+        font-size: var(--pf-v5-global--FontSize--md);
+    }
+
+    // Size, align, and space icon correctly
+    .breadcrumb-hdd-icon {
+        // Set the size to a large icon
+        block-size: var(--pf-v5-global--icon--FontSize--lg);
+        // Width should resolve itself based on height and aspect ratio
+        inline-size: auto;
+        // Align to the middle (as one would expect)
+        vertical-align: middle;
+        // Fix the offset problem so it's properly aligned to middle
+        margin-block-start: calc(1ex - 1cap);
     }
 }
 
 .breadcrumb {
     &-button {
-        padding-inline: 0;
-        // HACK: override PF button behaviour, breadcrumbs should
-        // be links not button and then we should be able to remove these
-        // overrides.
-        // https://github.com/cockpit-project/cockpit-files/issues/641
-        overflow-wrap: break-word;
-        white-space: normal;
-
-        &.breadcrumb-0 {
-            margin-inline-start: var(--pf-v5-global--spacer--sm);
-        }
-
         &-edit-apply,
         &-edit-cancel {
             padding-inline: var(--pf-v5-global--spacer--sm);
@@ -130,10 +166,6 @@
     }
 }
 
-.path-divider {
-    color: var(--pf-v5-global--Color--200);
-}
-
 .view-toggle-group {
     .pf-c-menu-toggle__button {
         display: flex;
@@ -198,3 +230,15 @@
         padding-block-start: 0;
     }
 }
+
+// // FIXME: Promote the CSS below to overrides, open PF issues // //
+
+// PatternFly always adds a margin after images inside of widgets with pf-m-end, which is incorrect when it's the last element
+.pf-v5-c-button__icon.pf-m-start:last-child {
+    margin-inline-end: 0;
+}
+
+// PF menu toggles are no longer spaced consistently
+.pf-v5-c-menu-toggle {
+    padding-inline: var(--pf-v5-global--spacer--md) calc(var(--pf-v5-global--spacer--md) * 0.75);
+}
diff --git a/src/files-breadcrumbs.tsx b/src/files-breadcrumbs.tsx
index c7710fa0..0f6fca3a 100644
--- a/src/files-breadcrumbs.tsx
+++ b/src/files-breadcrumbs.tsx
@@ -19,15 +19,15 @@
 import React from "react";
 
 import { AlertVariant } from "@patternfly/react-core/dist/esm/components/Alert";
+import { Breadcrumb, BreadcrumbItem } from "@patternfly/react-core/dist/esm/components/Breadcrumb";
 import { Button } from "@patternfly/react-core/dist/esm/components/Button";
 import { Divider } from "@patternfly/react-core/dist/esm/components/Divider";
 import { Dropdown, DropdownItem, DropdownList } from "@patternfly/react-core/dist/esm/components/Dropdown";
 import { MenuToggle, MenuToggleElement } from "@patternfly/react-core/dist/esm/components/MenuToggle";
-import { PageBreadcrumb } from "@patternfly/react-core/dist/esm/components/Page";
+import { PageBreadcrumb, PageSection, PageSectionVariants } from "@patternfly/react-core/dist/esm/components/Page";
 import { TextInput } from "@patternfly/react-core/dist/esm/components/TextInput";
 import { Tooltip, TooltipPosition } from "@patternfly/react-core/dist/esm/components/Tooltip";
-import { Flex, FlexItem } from "@patternfly/react-core/dist/esm/layouts/Flex";
-import { CheckIcon, HddIcon, PencilAltIcon, StarIcon, TimesIcon } from "@patternfly/react-icons";
+import { CheckIcon, OutlinedHddIcon, PencilAltIcon, StarIcon, TimesIcon } from "@patternfly/react-icons";
 import { useInit } from "hooks.js";
 
 import cockpit from "cockpit";
@@ -37,29 +37,6 @@ import { basename } from "./common";
 
 const _ = cockpit.gettext;
 
-function useHostname() {
-    const [hostname, setHostname] = React.useState<string | null>(null);
-
-    React.useEffect(() => {
-        const client = cockpit.dbus('org.freedesktop.hostname1');
-        const hostname1 = client.proxy('org.freedesktop.hostname1', '/org/freedesktop/hostname1');
-
-        function changed() {
-            if (hostname1.valid && typeof hostname1.Hostname === 'string') {
-                setHostname(hostname1.Hostname);
-            }
-        }
-
-        hostname1.addEventListener("changed", changed);
-        return () => {
-            hostname1.removeEventListener("changed", changed);
-            client.close();
-        };
-    }, []);
-
-    return hostname;
-}
-
 function BookmarkButton({ path }: { path: string[] }) {
     const [isOpen, setIsOpen] = React.useState(false);
     const [user, setUser] = React.useState<cockpit.UserInfo | null>(null);
@@ -205,15 +182,71 @@ function BookmarkButton({ path }: { path: string[] }) {
     );
 }
 
+const PathBreadcrumbs = ({ path }: { path: string[] }) => {
+    // HACK: strip extraneous slashes as PF's breadcrumb can't handle them
+    // Refactor the path to be the fullpath not an array of strings
+    if (path.length >= 2 && path[0] === '' && path[1] === '') {
+        path = path.slice(1);
+    }
+
+    if (path.length > 1 && path[path.length - 1] === '') {
+        path = path.slice(path.length - 1);
+    }
+
+    function navigate(event: React.MouseEvent<HTMLElement>) {
+        const { button, ctrlKey, metaKey } = event;
+        const target = event.target as HTMLButtonElement;
+        const isAnchor = target.matches("a");
+
+        if (!target.parentElement)
+            return;
+        const link = target.parentElement.getAttribute("data-location");
+
+        // Let the browser natively handle non-primary click events
+        // or if the control or meta (Mac) keys are pressed
+        // ...this lets opening in a new tab or window work by default.
+        if (isAnchor && link && (button === 0 && !ctrlKey && !metaKey)) {
+            event.preventDefault();
+            cockpit.location.go("/", { path: encodeURIComponent(link) });
+        }
+    }
+
+    return (
+        <Breadcrumb onClick={(event) => navigate(event)}>
+            {path.map((dir, i) => {
+                const url_path = path.slice(0, i + 1).join("/") || '/';
+                // We can't use a relative path as that will use the iframe's
+                // url while we want the outer shell url. And we can't obtain
+                // the full path of the shell easily, so a middle click will
+                // open a files page without the shell.
+                const link = `${window.location.pathname}#/?path=${url_path}`;
+
+                return (
+                    <BreadcrumbItem
+                      key={url_path}
+                      data-location={url_path}
+                      to={link}
+                      isActive={i === path.length - 1}
+                    >
+                        {i === 0 &&
+                            <Tooltip
+                              content={_("Filesystem")}
+                              position={TooltipPosition.bottom}
+                            >
+                                <OutlinedHddIcon className="breadcrumb-hdd-icon" />
+                            </Tooltip>}
+                        {i !== 0 && dir}
+                    </BreadcrumbItem>
+                );
+            })}
+        </Breadcrumb>
+    );
+};
+
 // eslint-disable-next-line max-len
 export function FilesBreadcrumbs({ path }: { path: string[] }) {
     const [editMode, setEditMode] = React.useState(false);
     const [newPath, setNewPath] = React.useState<string | null>(null);
-    const hostname = useHostname();
-
-    function navigate(n_parts: number) {
-        cockpit.location.go("/", { path: encodeURIComponent(path.slice(0, n_parts).join("/")) });
-    }
 
     const handleInputKey = (event: React.KeyboardEvent<HTMLInputElement>) => {
         // Don't propogate navigation specific events
@@ -248,14 +281,15 @@ export function FilesBreadcrumbs({ path }: { path: string[] }) {
         setEditMode(false);
     };
 
-    const fullPath = path.slice(1);
-    fullPath.unshift(hostname || "server");
-
     return (
-        <PageBreadcrumb stickyOnBreakpoint={{ default: "top" }}>
-            <Flex spaceItems={{ default: "spaceItemsSm" }}>
-                <BookmarkButton path={path} />
-                {!editMode &&
+        <PageSection
+          variant={PageSectionVariants.light}
+          className="files-overview-header"
+          padding={{ default: "padding" }}
+        >
+            <BookmarkButton path={path} />
+            {!editMode &&
+                <>
                     <Tooltip content={_("Edit path")} position={TooltipPosition.bottom}>
                         <Button
                           variant="secondary"
@@ -263,51 +297,35 @@ export function FilesBreadcrumbs({ path }: { path: string[] }) {
                           onClick={() => enableEditMode()}
                           className="breadcrumb-button-edit"
                         />
-                    </Tooltip>}
-                {!editMode && fullPath.map((dir, i) => {
-                    return (
-                        <React.Fragment key={fullPath.slice(0, i).join("/") || "/"}>
-                            <Button
-                              isDisabled={i === path.length - 1}
-                              icon={i === 0 ? <HddIcon /> : null}
-                              variant="link" onClick={() => { navigate(i + 1) }}
-                              className={`breadcrumb-button breadcrumb-${i}`}
-                            >
-                                {dir || "/"}
-                            </Button>
-                            {dir !== "" && <p className="path-divider" key={i}>/</p>}
-                        </React.Fragment>
-                    );
-                })}
-                {editMode && newPath !== null &&
-                    <FlexItem flex={{ default: "flex_1" }}>
-                        <TextInput
-                          autoFocus // eslint-disable-line jsx-a11y/no-autofocus
-                          id="new-path-input"
-                          value={newPath}
-                          onFocus={(event) => event.target.select()}
-                          onKeyDown={handleInputKey}
-                          onChange={(_event, value) => setNewPath(value)}
-                        />
-                    </FlexItem>}
-                <FlexItem align={{ default: 'alignRight' }}>
-                    {editMode &&
-                    <>
-                        <Button
-                          variant="plain"
-                          icon={<CheckIcon className="breadcrumb-edit-apply-icon" />}
-                          onClick={changePath}
-                          className="breadcrumb-button-edit-apply"
-                        />
-                        <Button
-                          variant="plain"
-                          icon={<TimesIcon />}
-                          onClick={() => cancelPathEdit()}
-                          className="breadcrumb-button-edit-cancel"
-                        />
-                    </>}
-                </FlexItem>
-            </Flex>
-        </PageBreadcrumb>
+                    </Tooltip>
+                    <PageBreadcrumb>
+                        <PathBreadcrumbs path={path} />
+                    </PageBreadcrumb>
+                </>}
+            {editMode && newPath !== null &&
+                <TextInput
+                  autoFocus // eslint-disable-line jsx-a11y/no-autofocus
+                  id="new-path-input"
+                  value={newPath}
+                  onFocus={(event) => event.target.select()}
+                  onKeyDown={handleInputKey}
+                  onChange={(_event, value) => setNewPath(value)}
+                />}
+            {editMode &&
+                <>
+                    <Button
+                      variant="plain"
+                      icon={<CheckIcon className="breadcrumb-edit-apply-icon" />}
+                      onClick={changePath}
+                      className="breadcrumb-button-edit-apply"
+                    />
+                    <Button
+                      variant="plain"
+                      icon={<TimesIcon />}
+                      onClick={() => cancelPathEdit()}
+                      className="breadcrumb-button-edit-cancel"
+                    />
+                </>}
+        </PageSection>
     );
 }
diff --git a/test/check-application b/test/check-application
index cddd97ab..d62202aa 100755
--- a/test/check-application
+++ b/test/check-application
@@ -42,6 +42,12 @@ class TestFiles(testlib.MachineCase):
     def assert_owner(self, path: str, owner: str) -> None:
         self.assert_stat('%U:%G', path, owner)
 
+    def assert_last_breadcrumb(self, directory: str) -> None:
+        if directory == '/':
+            self.browser.wait_visible("a.pf-v5-c-breadcrumb__link.pf-m-current svg.breadcrumb-hdd-icon")
+        else:
+            self.browser.wait_text(".pf-v5-c-page__main-breadcrumb a.pf-m-current", directory)
+
     def delete_item(self, filetype: str, filename: str, *, expect_success: bool = True) -> None:
         b = self.browser
         b.click(f"[data-item='{filename}']")
@@ -130,7 +136,7 @@ class TestFiles(testlib.MachineCase):
         b.wait_text(".pf-v5-c-empty-state__title-text", "Directory is empty")
         b.wait_not_in_text(".pf-v5-c-empty-state", "1 item is hidden")
 
-        b.click(".breadcrumb-2")  # go back to home dir
+        b.click("li[data-location='/home/admin'] a")  # go back to home dir
         m.execute("rm -r /home/admin/empty")
         b.wait_not_present("[data-item='empty']")
 
@@ -242,7 +248,7 @@ class TestFiles(testlib.MachineCase):
 
         # List root directory
         # Click "/" on the breadcrumb
-        b.click(".breadcrumb-0")
+        b.click("li[data-location='/'] a")  # go back to home dir
         b.wait_visible("[data-item='home']")
 
         # Enter /dev to make sure we can show special files properly
@@ -260,15 +266,13 @@ class TestFiles(testlib.MachineCase):
 
         self.enter_files()
 
-        hostname = m.execute("hostname").strip()
-        b.wait_text(".breadcrumb-0", hostname)
-        b.wait_text(".breadcrumb-1", "home")
-        b.wait_text(".breadcrumb-2", "admin")
+        b.wait_text("li[data-location='/home']", "home")
+        b.wait_text("li[data-location='/home/admin']", "admin")
 
         # clicking on the home button should take us to the home directory
-        b.click(".breadcrumb-1")
-        b.wait_visible(".breadcrumb-1:disabled")
-        b.wait_text(".breadcrumb-1", "home")
+        b.click("li[data-location='/home'] a")
+        b.wait_visible("li[data-location='/home'] a.pf-m-current")
+        b.wait_text("li[data-location='/home']", "home")
         b.wait_visible("[data-item='admin']")
 
         # show folder info in sidebar
@@ -278,7 +282,7 @@ class TestFiles(testlib.MachineCase):
         # double-clicking on a directory should take us into it
         b.mouse("[data-item='admin']", "dblclick")
         b.wait_not_present("[data-item='admin']")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "admin")
+        self.assert_last_breadcrumb("admin")
 
         # navigating into a directory resets the sidebar
         b.wait_in_text("#sidebar-card-header", "admin")
@@ -289,7 +293,7 @@ class TestFiles(testlib.MachineCase):
         b.wait_in_text("#sidebar-card-header", "symbolic link to /tmp")
         b.mouse("[data-item='tmplink']", "dblclick")
         b.wait_not_present("[data-item='tmplink']")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "tmplink")
+        self.assert_last_breadcrumb("tmplink")
         b.go("/files#/?path=/home/admin")
         b.wait_not_present(".pf-v5-c-empty-state")
 
@@ -301,8 +305,8 @@ class TestFiles(testlib.MachineCase):
         b.wait_visible("[data-item='newdir2']")
         b.mouse("[data-item='newdir2']", "dblclick")
         b.wait_not_present("[data-item='newdir']")
-        b.click(".breadcrumb-1")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "home")
+        b.click("li[data-location='/home'] a")
+        self.assert_last_breadcrumb("home")
         b.wait_visible("[data-item='admin']")
         # navigate back
         b.eval_js("window.history.back()")
@@ -318,26 +322,20 @@ class TestFiles(testlib.MachineCase):
         b.eval_js("window.history.forward()")
         b.wait_in_text("#sidebar-card-header", "newdir")
         b.wait_not_present("[data-item='admin']")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "newdir")
+        self.assert_last_breadcrumb("newdir")
         b.eval_js("window.history.forward()")
         b.wait_in_text("#sidebar-card-header", "newdir2")
         b.wait_not_present("[data-item='newdir']")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "newdir2")
+        self.assert_last_breadcrumb("newdir2")
         b.eval_js("window.history.forward()")
         # Switching navigation resets selected state
         b.wait_visible("[data-item='admin']")
         b.wait_not_present("[data-item='admin'].row-selected")
         b.wait_in_text("#sidebar-card-header", "home")
         b.wait_not_present("[data-item='newdir']")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "home")
+        self.assert_last_breadcrumb("home")
         b.wait_visible("[data-item='admin']")
 
-        # Changing hostname updates breadcrumb
-        original_hostname = m.execute('hostnamectl hostname').strip()
-        self.addCleanup(m.execute, ['hostnamectl', 'set-hostname', original_hostname])
-        m.execute("hostnamectl set-hostname files")
-        b.wait_text(".breadcrumb-0", "files")
-
         # Navigation via editing the path
         path_input = "#new-path-input"
         edit_button = ".breadcrumb-button-edit"
@@ -369,13 +367,13 @@ class TestFiles(testlib.MachineCase):
         b.set_input_text(path_input, "/opt")
         b.focus(path_input)
         b.key("Enter")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "opt")
+        self.assert_last_breadcrumb("opt")
 
         # Via apply button
         b.click(edit_button)
         b.set_input_text(path_input, "/var")
         b.click(apply_button)
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "var")
+        self.assert_last_breadcrumb("var")
 
         # Editing and cancelling does not remember input
         b.click(edit_button)
@@ -391,7 +389,7 @@ class TestFiles(testlib.MachineCase):
         b.click(edit_button)
         b.set_input_text(path_input, "/")
         b.click(apply_button)
-        b.wait_text("button.pf-m-disabled.breadcrumb-button + p", "/")
+        self.assert_last_breadcrumb("/")
         b.click(edit_button)
         b.wait_val(path_input, "/")
         b.click(cancel_button)
@@ -401,15 +399,15 @@ class TestFiles(testlib.MachineCase):
         self.browser.wait_js_cond("ph_count('#folder-view tbody tr') == 1")
 
         b.mouse("[data-item='sys']", "dblclick")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "sys")
+        self.assert_last_breadcrumb("sys")
         b.wait_val("input[placeholder='Filter directory']", "")
 
         b.set_input_text("input[placeholder='Filter directory']", "no-matches-at-all")
         self.browser.wait_js_cond("ph_count('#folder-view tbody tr') == 0")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "sys")
+        self.assert_last_breadcrumb("sys")
 
-        b.click(".breadcrumb-0")
-        b.wait_text("button.pf-m-disabled.breadcrumb-button + p", "/")
+        b.click("li[data-location='/'] a")
+        self.assert_last_breadcrumb("/")
         b.wait_val("input[placeholder='Filter directory']", "")
 
     def testSorting(self) -> None:
@@ -733,12 +731,11 @@ class TestFiles(testlib.MachineCase):
         alert_text = "mkdir: cannot create directory ‘/home/admin/newdir/test’: Operation not permitted"
         self.wait_modal_inline_alert(alert_text)
         b.click("div.pf-v5-c-modal-box__close button.pf-v5-c-button")
-        b.click(".breadcrumb-1")
         m.execute("sudo chattr -i /home/admin/newdir")
 
         # Creating folder as superuser a non-logged in owned directory has the expected folder permissions
         b.go("/files#/?path=/root")
-        b.wait_not_present(".pf-v5-c-empty-state")
+        self.assert_last_breadcrumb("root")
         self.addCleanup(m.execute, ['rm', '-rf', '/root/newdir'])
         self.create_directory("newdir")
         b.wait_visible("[data-item='newdir']")
@@ -1191,12 +1188,12 @@ class TestFiles(testlib.MachineCase):
         b.wait_text("#description-list-group dd", "admin")
 
         # Cannot change permission of /home
-        b.click(".breadcrumb-0")
+        b.click("li[data-location='/'] a")
         b.click("[data-item='home']")
         b.click("button:contains('Edit permissions')")
         select_access("7")
         b.click("button.pf-m-primary")
-        self.wait_modal_inline_alert("chmod: changing permissions of '/home': Operation not permitted")
+        self.wait_modal_inline_alert("chmod: changing permissions of '//home': Operation not permitted")
         b.click("button.pf-m-link")
         b.wait_not_present(".pf-v5-c-modal-box")
 
@@ -1292,13 +1289,13 @@ class TestFiles(testlib.MachineCase):
         b.assert_pixels(".pf-v5-c-page__main", "error-folder-view")
 
         # clicking on the home button should take us to the home directory
-        b.click(".breadcrumb-2")
+        b.click("li[data-location='/home/admin'] a")
 
         # Now set a+r.  We will be able to enter the directory now, and see the
         # files present, but not read any information about them (not +x).
         m.execute('touch /home/admin/testdir/testfile && chmod a+r /home/admin/testdir')
         b.mouse("[data-item='testdir']", "dblclick")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "testdir")
+        self.assert_last_breadcrumb("testdir")
         b.click("[data-item='testfile']")
         b.wait_in_text("#sidebar-card-header", "testfile")
         b.wait_text("#description-list-owner dd", "unknown")
@@ -1404,7 +1401,7 @@ class TestFiles(testlib.MachineCase):
 
         b.wait_visible("[data-item='foo'].row-selected")
         b.key("Enter")
-        b.wait_text(".breadcrumb-3", "foo")
+        self.assert_last_breadcrumb("foo")
 
     def testCopyPaste(self) -> None:
         b = self.browser
@@ -1421,14 +1418,14 @@ class TestFiles(testlib.MachineCase):
         b.click("#dropdown-menu")
         b.click("#copy-item")
         b.mouse("[data-item='newdir']", "dblclick")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "newdir")
+        self.assert_last_breadcrumb("newdir")
         b.wait_in_text(".pf-v5-c-empty-state", "Directory is empty")
         b.click("#dropdown-menu")
         b.click("#paste-item")
         b.wait_visible("[data-item='newfile']")
         self.assertEqual(m.execute("head -n 1 /home/admin/newdir/newfile"), "test_text\n")
-        b.click(".breadcrumb-2")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "admin")
+        b.click("li[data-location='/home/admin'] a")
+        self.assert_last_breadcrumb("admin")
         # original file still exists
         b.wait_visible("[data-item='newfile']")
 
@@ -1439,13 +1436,13 @@ class TestFiles(testlib.MachineCase):
         b.click("#dropdown-menu")
         b.click("#copy-item")
         b.mouse("[data-item='newdir']", "dblclick")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "newdir")
+        self.assert_last_breadcrumb("newdir")
         b.wait_visible("[data-item='loaded']")
         b.click("#dropdown-menu")
         b.click("#paste-item")
         b.wait_visible("[data-item='copyDir']")
-        b.click(".breadcrumb-2")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "admin")
+        b.click("li[data-location='/home/admin'] a")
+        self.assert_last_breadcrumb("admin")
         b.wait_visible("[data-item='copyDir']")
 
         # File already exists error
@@ -1460,8 +1457,8 @@ class TestFiles(testlib.MachineCase):
         self.assertEqual(m.execute("head -n 1 /home/admin/newdir/newfile"), "test_text\n")
         b.wait_in_text("h4.pf-v5-c-alert__title", "Pasting failed")
         b.wait_in_text(".pf-v5-c-alert__description", "\"newfile\" exists")
-        b.click(".breadcrumb-2")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "admin")
+        b.click("li[data-location='/home/admin'] a")
+        self.assert_last_breadcrumb("admin")
 
     @testlib.skipBrowser(".upload_files() doesn't work on Firefox", "firefox")
     def testUpload(self) -> None:
@@ -1522,7 +1519,7 @@ class TestFiles(testlib.MachineCase):
             """)
 
             b.go("/files#/?path=/mnt/upload")
-            b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "upload")
+            self.assert_last_breadcrumb("upload")
             b.wait_text(".pf-v5-c-empty-state__title-text", "Directory is empty")
             b.click("#upload-file-btn")
             b.upload_files("#upload-file-btn + input[type='file']", [big_file])
@@ -1536,7 +1533,7 @@ class TestFiles(testlib.MachineCase):
             dest_dir = "/home/admin/project"
             m.execute(['runuser', '-u', 'admin', 'mkdir', dest_dir])
             b.go(f"/files#/?path={dest_dir}")
-            b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "project")
+            self.assert_last_breadcrumb("project")
             b.wait_text(".pf-v5-c-empty-state__title-text", "Directory is empty")
 
             files = [str(Path(tmpdir) / f"{i}.txt") for i in range(0, 5)]
@@ -1844,7 +1841,7 @@ class TestFiles(testlib.MachineCase):
 
         # Add a bookmark
         b.go("/files#/?path=/etc")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "etc")
+        self.assert_last_breadcrumb("etc")
         b.wait_visible("[data-item='passwd']")
 
         b.click("#bookmark-btn")
@@ -1873,7 +1870,7 @@ class TestFiles(testlib.MachineCase):
         b.click("#bookmark-btn")
         b.click(".pf-v5-c-menu .pf-v5-c-menu__list-item:contains('/etc') button")
         b.wait_not_present(".pf-v5-c-empty-state")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "etc")
+        self.assert_last_breadcrumb("etc")
 
         # Bookmarks from nautilus are supported
         m.execute("""
@@ -1883,7 +1880,7 @@ class TestFiles(testlib.MachineCase):
         """)
         b.click("#bookmark-btn")
         b.click(".pf-v5-c-menu .pf-v5-c-menu__list-item:contains('This is a-test') button")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "This is a-test")
+        self.assert_last_breadcrumb("This is a-test")
 
         # Removing directory with spaces or aliases
         b.click("#bookmark-btn")
@@ -1902,7 +1899,7 @@ class TestFiles(testlib.MachineCase):
         # Removing /tmp bookmark keeps bookmark with spaces
         b.click("#bookmark-btn")
         b.click(".pf-v5-c-menu .pf-v5-c-menu__list-item:contains('tmp') button")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "tmp")
+        self.assert_last_breadcrumb("tmp")
 
         b.click("#bookmark-btn")
         b.click(".pf-v5-c-menu .pf-v5-c-menu__list-item:contains('Remove current directory') button")
@@ -1917,7 +1914,7 @@ class TestFiles(testlib.MachineCase):
         b.go("/files#/?path=/home/admin")
         b.wait_visible(f"[data-item='{special_dir}'")
         b.mouse(f"[data-item='{special_dir}']", "dblclick")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", special_dir)
+        self.assert_last_breadcrumb(special_dir)
 
         b.click("#bookmark-btn")
         b.click(".pf-v5-c-menu .pf-v5-c-menu__list-item:contains(Add bookmark) button")
@@ -1926,12 +1923,12 @@ class TestFiles(testlib.MachineCase):
         self.assertEqual("file:///etc\nfile:///home/admin/This%20is%20a-test\nfile:///home/admin/super%23special*1%202%3E%3C.%2C%C3%9F\n",
                          read_config())
 
-        b.click(".breadcrumb-2")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "admin")
+        b.click("li[data-location='/home/admin'] a")
+        self.assert_last_breadcrumb("admin")
 
         b.click("#bookmark-btn")
         b.click(".pf-v5-c-menu .pf-v5-c-menu__list-item:contains('super#special') button")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", special_dir)
+        self.assert_last_breadcrumb(special_dir)
 
         b.click("#bookmark-btn")
         b.click(".pf-v5-c-menu .pf-v5-c-menu__list-item:contains('Remove current directory') button")
@@ -1950,7 +1947,7 @@ class TestFiles(testlib.MachineCase):
         b.click(".pf-v5-c-menu .pf-v5-c-menu__list-item:contains('/var') button")
         b.wait_not_present(".pf-v5-c-empty-state")
         b.wait_not_present(".pf-v5-c-menu .pf-v5-c-menu__list-item:contains('lalala') button")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "var")
+        self.assert_last_breadcrumb("var")
 
         # Removing bookmarks file removes all bookmarks
         m.execute("rm -rf /home/admin/.config/gtk-3.0/bookmarks")
@@ -1963,7 +1960,7 @@ class TestFiles(testlib.MachineCase):
         m.execute("runuser -u admin echo 'file:///tmp/non-existant' > /home/admin/.config/gtk-3.0/bookmarks")
         b.click("#bookmark-btn")
         b.click(".pf-v5-c-menu .pf-v5-c-menu__list-item:contains('non-existant') button")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "non-existant")
+        self.assert_last_breadcrumb("non-existant")
         b.click("#bookmark-btn")
         b.click(".pf-v5-c-menu .pf-v5-c-menu__list-item:contains('Remove current directory') button")
         b.wait_not_present(".pf-v5-c-menu")
@@ -1985,7 +1982,7 @@ class TestFiles(testlib.MachineCase):
         """)
 
         b.go("/files#/?path=/var")
-        b.wait_text(".pf-v5-c-page__main-breadcrumb > div > button:last-of-type", "var")
+        self.assert_last_breadcrumb("var")
 
         b.click("#bookmark-btn")
         b.click(".pf-v5-c-menu .pf-v5-c-menu__list-item:contains(Add bookmark) button")
diff --git a/test/reference b/test/reference
index a1c7cf36..0ba388e4 160000
--- a/test/reference
+++ b/test/reference
@@ -1 +1 @@
-Subproject commit a1c7cf36c6fb3209b76b19568b5d51d59f455780
+Subproject commit 0ba388e42e660d44b2e5ac58c04e43732a10a404