diff --git a/pyproject.toml b/pyproject.toml
index f699acf..73c18c3 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -26,7 +26,7 @@ classifiers = [
 ]
 dependencies = [
   "capellambse>=0.6.6,<0.7",
-  "capellambse-context-diagrams>=0.4.0",
+  "capellambse-context-diagrams>=0.4.1",
   "capella-diff-tools",
   "diff-match-patch",
   "jinja2",
diff --git a/templates/functional.html.j2 b/templates/functional.html.j2
index ca62b6e..e39588c 100644
--- a/templates/functional.html.j2
+++ b/templates/functional.html.j2
@@ -49,7 +49,7 @@
             <tr>
             <td>FEX-{{ exchange.uuid[-5:] | upper}}</td>
             <td>
-                <p>While performing {{ linked_name_with_icon(exchange.source.owner) | safe }} activity {{ source_owner | safe }} may provide {{ linked_name_with_icon(exchange) | safe }} to {{ owner | safe }} so that {{ owner_name | safe }} could {{ object.name }}.</p>
+                <p>While performing {{ linked_name_with_icon(exchange.source.owner) | safe }} activity {{ source_owner | safe }} may provide {{ linked_name_with_icon(exchange) | safe }} to {{ owner | safe }} so that {{ owner_name | safe }} could {{ linked_name_with_icon(object) | safe }}.</p>
                 {{ list_related_exchange_items(exchange) | safe }}
             </td>
             </tr>
diff --git a/templates/physical-architecture/physical-link.html.j2 b/templates/physical-architecture/physical-link.html.j2
index e1032d1..eeb39d5 100644
--- a/templates/physical-architecture/physical-link.html.j2
+++ b/templates/physical-architecture/physical-link.html.j2
@@ -11,9 +11,11 @@
 <p>A part of {{ linked_name(object.parent) | safe }}</p>
 {% endif %}
 
+{{ object.context_diagram.as_svg | safe }}
+
 <p>Connects {{ linked_name(object.ends[0].owner) | safe}} via {{ linked_name(object.ends[0]) | safe }}  port and {{ linked_name(object.ends[1].owner) | safe }} via {{ linked_name(object.ends[1]) | safe }} port.</p>
 
 {{ display_property_values(object ) | safe }}
 
-{% set covered = ["ends", "linkEnds", "name", "owner", "source", "target", "xtype", "applied_property_value_groups", "property_value_groups", "parent"] %}
+{% set covered = ["ends", "linkEnds", "name", "owner", "source", "target", "xtype", "applied_property_value_groups", "property_value_groups", "parent", "context_diagram"] %}
 {{show_other_attributes(object, covered) | safe}}
diff --git a/templates/system-analysis/system-definition.html.j2 b/templates/system-analysis/system-definition.html.j2
index 0683754..7c8a5cc 100644
--- a/templates/system-analysis/system-definition.html.j2
+++ b/templates/system-analysis/system-definition.html.j2
@@ -3,7 +3,7 @@
     SPDX-License-Identifier: Apache-2.0
 #}
 
-{% from 'common_macros.html.j2' import show_other_attributes %}
+{% from 'common_macros.html.j2' import show_other_attributes, linked_name_with_icon %}
 
 {% set object = model.sa.root_component%}
 <h1>System Definition</h1>
@@ -42,7 +42,7 @@
     <p>The system is expected to perform the following functions:</p>
     <ul>
         {% for fnc in object.allocated_functions %}
-            <li><a href="{{ fnc | make_href }}">{{ fnc.name }}</a></li>
+            <li><a href="{{ fnc | make_href }}">{{ linked_name_with_icon(fnc) | safe }}</a></li>
         {% endfor %}
     </ul>
 {% else %}