diff --git a/symfony.lock b/symfony.lock
index 1f7f867f..4f808d7e 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -340,6 +340,9 @@
     "phpstan/phpstan-symfony": {
         "version": "0.12.4"
     },
+    "psalm/plugin-symfony": {
+        "version": "v1.2.1"
+    },
     "psr/cache": {
         "version": "1.0.1"
     },
diff --git a/templates/AdminPages/CompanyAdminBase.html.twig b/templates/AdminPages/CompanyAdminBase.html.twig
index a9d79534..6219d62f 100644
--- a/templates/AdminPages/CompanyAdminBase.html.twig
+++ b/templates/AdminPages/CompanyAdminBase.html.twig
@@ -22,16 +22,5 @@
 {% endblock %}
 
 {% block quick_links %}
-    {% if entity.website is not empty %}
-        <a href="{{ entity.website }}" title="{% trans %}company.edit.quick.website{% endtrans %}" data-no-ajax><i class="fas fa-globe fa-fw fa-lg"></i></a>
-    {% endif %}
-    {% if entity.emailAddress is not empty %}
-        <a href="mailto:{{ entity.emailAddress }}" title="{% trans %}company.edit.quick.email{% endtrans %}" data-no-ajax><i class="fas fa-envelope-open-text fa-lg"></i></a>
-    {% endif %}
-    {% if entity.phoneNumber is not empty %}
-        <a href="tel:{{ entity.phoneNumber | replace({' ': ''}) }}" title="{% trans %}company.edit.quick.phone{% endtrans %}" data-no-ajax><i class="fas fa-phone fa-lg"></i></a>
-    {% endif %}
-    {% if entity.faxNumber is not empty %}
-        <a href="tel:{{ entity.faxNumber | replace({' ': ''}) }}" title="{% trans %}company.edit.quick.fax{% endtrans %}" data-no-ajax><i class="fas fa-fax fa-lg"></i></a>
-    {% endif %}
+    {% include 'QuickLinks/_company.html.twig' %}
 {% endblock %}
\ No newline at end of file
diff --git a/templates/Parts/lists/_info_card.html.twig b/templates/Parts/lists/_info_card.html.twig
index 8f5d633e..6fa600d8 100644
--- a/templates/Parts/lists/_info_card.html.twig
+++ b/templates/Parts/lists/_info_card.html.twig
@@ -66,6 +66,8 @@
                                     </div>
                                 </div>
                                 <div class="col-sm-3">
+                                    {% block quick_links %}{% endblock %}
+
                                     <a class="btn btn-secondary btn-block mb-2" href="{{ entity | entityURL('edit') }}">
                                         <i class="fas fa-edit"></i> {% trans %}entity.edit.btn{% endtrans %}
                                     </a>
diff --git a/templates/Parts/lists/manufacturer_list.html.twig b/templates/Parts/lists/manufacturer_list.html.twig
index 9bfb4684..a42f55ea 100644
--- a/templates/Parts/lists/manufacturer_list.html.twig
+++ b/templates/Parts/lists/manufacturer_list.html.twig
@@ -6,7 +6,13 @@
 
 {% block content %}
 
-    {% include "Parts/lists/_info_card.html.twig" with {'header_label': 'manufacturer.label'} %}
+    {% embed "Parts/lists/_info_card.html.twig" with {'header_label': 'manufacturer.label'} %}
+        {% block quick_links %}
+            <div class="mb-2">
+                {% include 'QuickLinks/_company.html.twig' %}
+            </div>
+        {% endblock %}
+    {% endembed %}
 
     {% include "Parts/lists/_action_bar.html.twig" with {'url_options': {'manufacturer': entity.iD}} %}
 
diff --git a/templates/Parts/lists/supplier_list.html.twig b/templates/Parts/lists/supplier_list.html.twig
index e7f4e70d..e25d398e 100644
--- a/templates/Parts/lists/supplier_list.html.twig
+++ b/templates/Parts/lists/supplier_list.html.twig
@@ -6,7 +6,13 @@
 
 {% block content %}
 
-    {% include "Parts/lists/_info_card.html.twig" with {'header_label': 'supplier.label'} %}
+    {% embed "Parts/lists/_info_card.html.twig" with {'header_label': 'supplier.label'} %}
+        {% block quick_links %}
+            <div class="mb-2">
+                {% include 'QuickLinks/_company.html.twig' %}
+            </div>
+        {% endblock %}
+    {% endembed %}
 
     {% include "Parts/lists/_action_bar.html.twig" with {'url_options': {'supplier': entity.iD}} %}
 
diff --git a/templates/QuickLinks/_company.html.twig b/templates/QuickLinks/_company.html.twig
new file mode 100644
index 00000000..a020d087
--- /dev/null
+++ b/templates/QuickLinks/_company.html.twig
@@ -0,0 +1,16 @@
+<div class="btn-toolbar">
+    <div class="btn-group btn-block">
+        {% if entity.website is not empty %}
+            <a class="btn btn-outline-dark" href="{{ entity.website }}" title="{% trans %}company.edit.quick.website{% endtrans %}" data-no-ajax><i class="fas fa-globe fa-fw"></i></a>
+        {% endif %}
+        {% if entity.emailAddress is not empty %}
+            <a class="btn btn-outline-dark" href="mailto:{{ entity.emailAddress }}" title="{% trans %}company.edit.quick.email{% endtrans %}" data-no-ajax><i class="fas fa-envelope-open-text"></i></a>
+        {% endif %}
+        {% if entity.phoneNumber is not empty %}
+            <a class="btn btn-outline-dark" href="tel:{{ entity.phoneNumber | replace({' ': ''}) }}" title="{% trans %}company.edit.quick.phone{% endtrans %}" data-no-ajax><i class="fas fa-phone"></i></a>
+        {% endif %}
+        {% if entity.faxNumber is not empty %}
+            <a class="btn btn-outline-dark" href="tel:{{ entity.faxNumber | replace({' ': ''}) }}" title="{% trans %}company.edit.quick.fax{% endtrans %}" data-no-ajax><i class="fas fa-fax"></i></a>
+        {% endif %}
+    </div>
+</div>
\ No newline at end of file