diff --git a/src/plainui/jinja2/plainui/assembly.html b/src/plainui/jinja2/plainui/assembly.html
index fe11b3049781c059f45a72c5c47b47d99bbc4926..ac3efed590869b627d642430033dd131637ee8bd 100644
--- a/src/plainui/jinja2/plainui/assembly.html
+++ b/src/plainui/jinja2/plainui/assembly.html
@@ -22,10 +22,7 @@
         <li class="breadcrumb-item active" aria-current="page">{{ assembly.name }}</li>
       </ol>
     </nav>
-    <p>
-        <a href="{{ url('backoffice:assembly-edit', pk=assembly.id) }}"><i class="bi bi-pencil-square"></i></a>
-    </p>
-    {{ titleMacro.title(assembly.name) }}
+    {{ titleMacro.title(assembly.name, edit_url=url('backoffice:assembly-edit', pk=assembly.id), fav_type=true, color="primary") }}
     {% if assembly.parent %}
     <h2 class="text-center">{{ _('Part of') }} <a href="{{ url('plainui:assembly', assembly_slug=assembly.parent.slug ) }}">{{ assembly.parent }}</a></h3>
     {% endif %}
diff --git a/src/plainui/jinja2/plainui/components/function_btns.html b/src/plainui/jinja2/plainui/components/function_btns.html
index 3ca5005bc44bae9e7660cec743529a473ffcb2fa..152cceaa357f913376b137d25e7c92b8a8a9a41d 100644
--- a/src/plainui/jinja2/plainui/components/function_btns.html
+++ b/src/plainui/jinja2/plainui/components/function_btns.html
@@ -85,8 +85,6 @@
 
 {% macro edit(edit, title=_("edit this"), color="transparent" ) -%}
     <a href="{{ edit }}" class="me-2 btn-icon-big btn btn-{{ color }}" title="{{ title }}">
-        <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-pencil" viewBox="0 0 16 16">
-          <path fill-rule="evenodd" d="M12.146.146a.5.5 0 0 1 .708 0l3 3a.5.5 0 0 1 0 .708l-10 10a.5.5 0 0 1-.168.11l-5 2a.5.5 0 0 1-.65-.65l2-5a.5.5 0 0 1 .11-.168l10-10zM11.207 2.5L13.5 4.793 14.793 3.5 12.5 1.207 11.207 2.5zm1.586 3L10.5 3.207 4 9.707V10h.5a.5.5 0 0 1 .5.5v.5h.5a.5.5 0 0 1 .5.5v.5h.293l6.5-6.5zm-9.761 5.175l-.106.106-1.528 3.821 3.821-1.528.106-.106A.5.5 0 0 1 5 12.5V12h-.5a.5.5 0 0 1-.5-.5V11h-.5a.5.5 0 0 1-.468-.325z"/>
-        </svg>
+        <i class="bi bi-pencil"></i>
     </a>
 {%- endmacro %}
diff --git a/src/plainui/jinja2/plainui/components/title.html b/src/plainui/jinja2/plainui/components/title.html
index df78ab61ef50e45a88e7787dfd97b7bb32b5d733..0c32916b406b7d099fed50b71acad9844c96af3d 100644
--- a/src/plainui/jinja2/plainui/components/title.html
+++ b/src/plainui/jinja2/plainui/components/title.html
@@ -6,7 +6,7 @@
 #}
 {% import "plainui/components/function_btns.html" as fbtns with context %}
 
-{% macro title(title="", fav_id=false, fav_type=false, fav_is=false, sch_id=false, sch_is=false, share_url=false, stream_url=false, report_url=false, report_kind="url", edit_url=false) -%}
+{% macro title(title="", fav_id=false, fav_type=false, fav_is=false, sch_id=false, sch_is=false, share_url=false, stream_url=false, report_url=false, report_kind="url", edit_url=false, color="transparent") -%}
     <div class="row {% if share_url %}w-100 my-11{% endif %}">
         <div class="col">
             <h1 class="text-center p-3" title="{{ title }}">{{ title }}</h1>
@@ -14,23 +14,23 @@
         {% if conf and share_url or fav_type or sch_id or stream_url %}
         <div class="col-sm-auto text-righ align-self-center">
             {% if share_url %}
-                {{ fbtns.share(share_url, color="transparent") }}
+                {{ fbtns.share(share_url, color=color) }}
             {% endif %}
 
             {% if fav_type and fav_id %}
-                {{ fbtns.fav(fav_id, fav_type, fav_is, color="transparent") }}
+                {{ fbtns.fav(fav_id, fav_type, fav_is, color=color) }}
             {% endif %}
 
             {% if sch_id %}
-                {{ fbtns.schedule(sch_id, sch_is, color="transparent") }}
+                {{ fbtns.schedule(sch_id, sch_is, color=color) }}
             {% endif %}
 
             {% if stream_url %}
-                {{ fbtns.stream(stream_url, color="transparent") }}
+                {{ fbtns.stream(stream_url, color=color) }}
             {% endif %}
 
             {% if edit_url %}
-                {{ fbtns.edit(edit_url, color="transparent") }}
+                {{ fbtns.edit(edit_url, color=color) }}
             {% endif %}
         </div>
         {% endif %}