diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 163127307..d1d84d301 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -261,6 +261,7 @@ jobs:
           composer require "drupal/responsive_preview" --no-update
           composer require "drupal/slick" --no-update
           composer require "drupal/blazy" --no-update
+          composer require "drupal/admin_toolbar:^3.4" --no-update
           composer require "drupal/core-dev:~11.1.0" --no-update
 
           composer update
diff --git a/composer.json b/composer.json
index ecc4c4377..29005055c 100644
--- a/composer.json
+++ b/composer.json
@@ -53,7 +53,6 @@
         "php": ">=8.3",
         "cweagans/composer-patches": "^1.6.5",
         "drupal/access_unpublished": "^1.5",
-        "drupal/admin_toolbar": "^3.4",
         "drupal/advancedqueue": "^1.2",
         "drupal/autofill": "^1.1",
         "drupal/autosave_form": "1.7",
diff --git a/config/install/navigation.settings.yml b/config/install/navigation.settings.yml
new file mode 100644
index 000000000..6968555d5
--- /dev/null
+++ b/config/install/navigation.settings.yml
@@ -0,0 +1,7 @@
+logo:
+  provider: custom
+  path: profiles/contrib/thunder/files/images/thunder.png
+  max:
+    filesize: 1048576
+    height: 40
+    width: 40
diff --git a/config/install/user.role.editor.yml b/config/install/user.role.editor.yml
index 89b5fa4e6..056fc04e1 100644
--- a/config/install/user.role.editor.yml
+++ b/config/install/user.role.editor.yml
@@ -18,6 +18,7 @@ dependencies:
     - file
     - filter
     - media
+    - navigation
     - node
     - path
     - scheduler
@@ -36,6 +37,7 @@ permissions:
   - 'access contextual links'
   - 'access files overview'
   - 'access media overview'
+  - 'access navigation'
   - 'access tokens overview'
   - 'access toolbar'
   - 'administer menu'
diff --git a/config/install/user.role.restricted_editor.yml b/config/install/user.role.restricted_editor.yml
index 8b74a5ad5..5d1f2b276 100644
--- a/config/install/user.role.restricted_editor.yml
+++ b/config/install/user.role.restricted_editor.yml
@@ -18,6 +18,7 @@ dependencies:
     - file
     - filter
     - media
+    - navigation
     - node
     - path
     - scheduler
@@ -34,6 +35,7 @@ permissions:
   - 'access contextual links'
   - 'access files overview'
   - 'access media overview'
+  - 'access navigation'
   - 'access tokens overview'
   - 'access toolbar'
   - 'break content lock'
diff --git a/config/install/user.role.seo.yml b/config/install/user.role.seo.yml
index dcffbd6f9..53eeacc62 100644
--- a/config/install/user.role.seo.yml
+++ b/config/install/user.role.seo.yml
@@ -19,6 +19,7 @@ dependencies:
     - filter
     - media
     - metatag
+    - navigation
     - node
     - path
     - redirect
@@ -39,6 +40,7 @@ permissions:
   - 'access contextual links'
   - 'access files overview'
   - 'access media overview'
+  - 'access navigation'
   - 'access tokens overview'
   - 'access toolbar'
   - 'administer menu'
diff --git a/css/toolbar.css b/css/toolbar.css
deleted file mode 100644
index 0446a8d2f..000000000
--- a/css/toolbar.css
+++ /dev/null
@@ -1,4 +0,0 @@
-#toolbar-item-administration-tray .toolbar-logo img {
-  height: 35px;
-  width: 35px;
-}
diff --git a/docs/developer-guide/migration/migrate-7-8.md b/docs/developer-guide/migration/migrate-7-8.md
index 6e8636cdf..d5a8ec899 100644
--- a/docs/developer-guide/migration/migrate-7-8.md
+++ b/docs/developer-guide/migration/migrate-7-8.md
@@ -31,12 +31,12 @@ drush updb
 You should at least see the Thunder XXXX schema update. If not, double check that the correct version of Thunder
 is installed, and that `drush updb` did not throw any errors.
 
-Before you start with the code and database update please add the Slick module, the Blazy module and the Responsive
-Preview module to your own composer.json. Both are no longer part of Thunder and can be removed after the update
-was successfully executed.
+Before you start with the code and database update please add the Slick module, the Blazy module, Admin Toolbar and the
+Responsive Preview module to your own composer.json. All are no longer part of Thunder and can be removed after the
+update was successfully executed.
 
 ```bash
-composer require drupal/blazy drupal/slick drupal/responsive_preview
+composer require drupal/blazy drupal/slick drupal/responsive_preview drupal/admin_toolbar
 ```
 
 Also, if you have jquery_ui, jquery_ui_draggable or default_content enabled, you have to
diff --git a/files/images/thunder.png b/files/images/thunder.png
new file mode 100644
index 000000000..9b564787d
Binary files /dev/null and b/files/images/thunder.png differ
diff --git a/tests/src/Functional/Integration/AdminToolbarTest.php b/tests/src/Functional/Integration/AdminToolbarTest.php
index 82415cc46..6910280b7 100644
--- a/tests/src/Functional/Integration/AdminToolbarTest.php
+++ b/tests/src/Functional/Integration/AdminToolbarTest.php
@@ -24,7 +24,7 @@ public function testEmptyMenuEntriesAreGone(): void {
     $this->assertSession()->elementNotExists('css', 'nav a[href="/admin/config/development"]');
     $this->assertSession()->elementNotExists('css', 'nav a[href="/admin/config/media"]');
 
-    $this->assertSession()->elementExists('css', 'nav a[href="/admin/config/search"]');
+    $this->assertSession()->elementExists('css', 'nav a[href="/admin/config/search/redirect"]');
   }
 
 }
diff --git a/tests/src/FunctionalJavascript/Integration/InlineEntityFormTest.php b/tests/src/FunctionalJavascript/Integration/InlineEntityFormTest.php
index 1099c10d6..69eee77ae 100644
--- a/tests/src/FunctionalJavascript/Integration/InlineEntityFormTest.php
+++ b/tests/src/FunctionalJavascript/Integration/InlineEntityFormTest.php
@@ -30,6 +30,7 @@ public function testGalleryCollapse(): void {
     // Test saving inline entity form when collapsing paragraph form.
     $node = $this->loadNodeByUuid('36b2e2b2-3df0-43eb-a282-d792b0999c07');
     $this->drupalGet($node->toUrl('edit-form'));
+    $this->getSession()->getPage()->find('css', '[data-drupal-selector="edit-actions"] .meta-sidebar__trigger')->click();
 
     // Edit gallery paragraph.
     $this->clickDrupalSelector('field-paragraphs-0-edit-2');
diff --git a/thunder.info.yml b/thunder.info.yml
index ef289512e..d439592a3 100644
--- a/thunder.info.yml
+++ b/thunder.info.yml
@@ -31,6 +31,7 @@ install:
   - drupal:inline_form_errors
   - drupal:media_library
   - drupal:menu_ui
+  - drupal:navigation
   - drupal:language
   - drupal:options
   - drupal:path
@@ -45,7 +46,6 @@ install:
   - drupal:views_ui
   # contrib
   - access_unpublished:access_unpublished
-  - admin_toolbar:admin_toolbar_tools
   - autosave_form:autosave_form
   - autofill:autofill
   - content_lock:content_lock
diff --git a/thunder.libraries.yml b/thunder.libraries.yml
index a0f2f8f2e..d5de68e17 100644
--- a/thunder.libraries.yml
+++ b/thunder.libraries.yml
@@ -1,8 +1,3 @@
-toolbar.icon:
-  css:
-    theme:
-      css/toolbar.css: {}
-
 module.configure.form:
   css:
     theme:
diff --git a/thunder.profile b/thunder.profile
index ed04f2b12..0f78c8b02 100644
--- a/thunder.profile
+++ b/thunder.profile
@@ -154,15 +154,6 @@ function thunder_page_attachments(array &$attachments): void {
   }
 }
 
-/**
- * Implements hook_library_info_alter().
- */
-function thunder_toolbar_alter(array &$items): void {
-  if (!empty($items['admin_toolbar_tools'])) {
-    $items['admin_toolbar_tools']['#attached']['library'][] = 'thunder/toolbar.icon';
-  }
-}
-
 /**
  * Implements hook_field_widget_info_alter().
  */