diff --git a/resources/assets/stylesheets/scss/contentbar.scss b/resources/assets/stylesheets/scss/contentbar.scss
index a7df7f734d07fe03e5b85c51c23847d25b62e3a8..01e586ffe56c27c1614df3de9b0afba115028fbe 100644
--- a/resources/assets/stylesheets/scss/contentbar.scss
+++ b/resources/assets/stylesheets/scss/contentbar.scss
@@ -16,10 +16,9 @@
 
     .contentbar-wrapper-left {
         display: flex;
-        flex: auto;
+        max-width: calc(100% - 130px);
 
         .contentbar-breadcrumb {
-            display: flex;
             font-size: 1.25em;
             line-height: 1.5em;
             margin-right: 1em;
diff --git a/templates/contentbar/contentbar.php b/templates/contentbar/contentbar.php
index f9b42edc6b2c41e31eae9728d9e9bbf9e9ada06d..a4632ca43a482e0bbaa3bcb9d27f883b87bb4a01 100644
--- a/templates/contentbar/contentbar.php
+++ b/templates/contentbar/contentbar.php
@@ -13,11 +13,11 @@
         <nav class="contentbar-nav"></nav>
         <div class="contentbar-wrapper-left">
             <nav class="contentbar-breadcrumb">
-            <? if (!$toc->isActive()) : ?>
+            <? if ($toc->isActive()): ?>
+                <?= $icon->asImg(24, ['class' => 'text-bottom contentbar-icon']) ?>
+            <? else: ?>
                 <a href="<?= $toc->getUrl() ?>" title="<?= htmlReady($toc->getTitle()) ?>" class="contentbar-icon">
-            <? endif ?>
                     <?= $icon->asImg(24, ['class' => 'text-bottom']) ?>
-            <? if (!$toc->isActive()) : ?>
                 </a>
             <? endif ?>
                 <?= $breadcrumbs->render() ?>
diff --git a/templates/toc/_toc-item-breadcrumb.php b/templates/toc/_toc-item-breadcrumb.php
index 4ea48c4a49010b784310ab5478348b9918a01201..d87419dd135ee43eac51b3feb3886300091288d3 100644
--- a/templates/toc/_toc-item-breadcrumb.php
+++ b/templates/toc/_toc-item-breadcrumb.php
@@ -1,7 +1,7 @@
 <? if (!$item->isRoot()) : ?>
     <?= $this->render_partial('toc/_toc-item-breadcrumb', ['item' => $item->getParent()]) ?>
 <? endif ?>
-<li>
+<li class="contentbar-breadcrumb-item <? if ($item->isActive()) echo 'contentbar-breadcrumb-item-current'; ?>">
     <? if (!$item->isActive()) : ?>
         <a class="navigate" href="<?= htmlReady($item->getURL()) ?>">
     <? endif ?>