diff --git a/src/plainui/jinja2/plainui/assembly.html.j2 b/src/plainui/jinja2/plainui/assembly.html.j2
index 79359815004374d32b8b59a34359e878b47bc741..b5472b45e54b1bcdb13aacb401d052d29c729b7e 100644
--- a/src/plainui/jinja2/plainui/assembly.html.j2
+++ b/src/plainui/jinja2/plainui/assembly.html.j2
@@ -9,6 +9,7 @@
 {% import "plainui/components/image.html.j2" as imageMacro %}
 {% import "plainui/components/badge_elements.html.j2" as badge_elements with context %}
 {% import "plainui/components/nav.html.j2" as navMacro with context %}
+{% import "plainui/components/function_btns.html.j2" as fbtns with context %}
 
 {% block title %}
   {{ conf.name }} - Assembly {{ assembly.name }}
@@ -58,6 +59,11 @@
           </div>
         {% endif %}
 
+        <div class="hub-hlayout">
+          {{ fbtns.fav(assembly.id, "assembly", fav_info.is, color="secondary", margin=False) }}
+          {{ fbtns.share('plainui:assembly', assembly_slug=assembly.slug, color="secondary", margin=False) }}
+          {{ fbtns.report(link, lookup_key=assembly.slug, color="warning", margin=False) }}
+        </div>
       </div>
       {% if assembly.banner_image %}
         <div class="hub-col-325px hub-card">
diff --git a/src/plainui/jinja2/plainui/components/function_btns.html.j2 b/src/plainui/jinja2/plainui/components/function_btns.html.j2
index 1ad5cd85bc5f314d57dbd63e622682e4132f5472..d3134fca51631d04ebc887be1797d30c70174c74 100644
--- a/src/plainui/jinja2/plainui/components/function_btns.html.j2
+++ b/src/plainui/jinja2/plainui/components/function_btns.html.j2
@@ -95,9 +95,9 @@
   {% endif %}
 {%- endmacro %}
 
-{% macro share(view_name, title=_("share this "), color="transparent") -%}
+{% macro share(view_name, title=_("share this "), color="transparent", margin=True) -%}
   <a href="{{ hub_absolute(view_name, i18n=archive_mode, **kwargs) }}"
-     class="me-2 btn-icon-big btn btn-{{ color }}"
+     class="btn-icon-big btn btn-{{ color }} {% if margin %}me-2{% endif %}"
      title="{{ title }}"
      target="_blank">
     <svg width="1.25rem"