diff --git a/templates/navigation/toolbar-button.html.twig b/templates/navigation/toolbar-button.html.twig
new file mode 100644
index 0000000000000000000000000000000000000000..2fd146a415bc8bda1083971d10a39464962205c7
--- /dev/null
+++ b/templates/navigation/toolbar-button.html.twig
@@ -0,0 +1,33 @@
+{# Extra classes variable added to be sure that modifiers will
+appear after main classes #}
+{%
+    set classes = [
+    'toolbar-button',
+    icon ? 'toolbar-button--icon--' ~ icon : '',
+    extra_classes,
+]
+%}
+<{{html_tag|default('button')}}
+    {{ attributes.addClass(classes) }}
+data-index-text="{{ text|first|lower }}"
+data-icon-text="{{- text|render|trim|slice(0, 2)|join('') -}}"
+>
+{% if avatar %}
+    <span class="toolbar-button__avatar">{{~ avatar ~}}</span>
+{% endif %}
+    {% if action %}
+    <span data-toolbar-action class="visually-hidden">{{ 'Extend'|t }}</span>
+    {% endif %}
+    {% block content %}
+    {% if text %}
+        <span class="toolbar-button__label {{ label_classes }}" data-text>{{~ text ~}}</span>
+    {% endif %}
+    {% endblock %}
+
+    {# Element that improves sub-menu UX by implementing the Safe Triangle strategy.
+More info at https://www.smashingmagazine.com/2023/08/better-context-menus-safe-triangles #}
+    {% if has_safe_triangle %}
+    <div data-toolbar-popover-safe-triangle></div>
+    {% endif %}
+
+</{{html_tag|default('button')}}>
\ No newline at end of file
diff --git a/templates/navigation/top-bar--gin.html.twig b/templates/navigation/top-bar--gin.html.twig
index dff41813e2297f83d0ca53f6db90e34804955695..e28b9e83487317662ff041fa7d44219e5f09e4b3 100644
--- a/templates/navigation/top-bar--gin.html.twig
+++ b/templates/navigation/top-bar--gin.html.twig
@@ -15,7 +15,7 @@
 {% endif %}
 <div {{ attributes.addClass('top-bar gin--navigation-top-bar').setAttribute('data-drupal-admin-styles', '') }}>
   <div class="top-bar__content">
-    {% include '@navigation/toolbar-button.html.twig' with {
+    {% include '@gin/navigation/toolbar-button.html.twig' with {
       attributes: create_attribute({'aria-expanded': 'false', 'aria-controls': 'admin-toolbar'}),
       icon: 'burger',
       text: 'Expand sidebar'|t,
