diff --git a/templates/admin/invoice/show/content/sections/buyer/country_code.html.twig b/templates/admin/invoice/show/content/sections/buyer/country_code.html.twig
index b5199bea..fe317f85 100644
--- a/templates/admin/invoice/show/content/sections/buyer/country_code.html.twig
+++ b/templates/admin/invoice/show/content/sections/buyer/country_code.html.twig
@@ -1 +1,5 @@
-<span class="flag flag-sm flag-country-{{ hookable_metadata.context.resource.billingData.countryCode|lower }} me-2"></span>
+{% set billing_data = hookable_metadata.context.resource.billingData %}
+
+{% if billing_data.countryCode %}
+    {{ ux_icon('flagpack:' ~ billing_data.countryCode|lower, {'class': 'icon me-1'}) }}
+{% endif %}
diff --git a/templates/admin/invoice/show/content/sections/seller/country_code.html.twig b/templates/admin/invoice/show/content/sections/seller/country_code.html.twig
index f5f15bb2..f4a1e438 100644
--- a/templates/admin/invoice/show/content/sections/seller/country_code.html.twig
+++ b/templates/admin/invoice/show/content/sections/seller/country_code.html.twig
@@ -1,5 +1,5 @@
 {% set shop_billing_data = hookable_metadata.context.resource.shopBillingData %}
 
 {% if shop_billing_data.countryCode %}
-    <span class="flag flag-sm flag-country-{{ shop_billing_data.countryCode|lower }} me-2"></span>
+    {{ ux_icon('flagpack:' ~ shop_billing_data.countryCode|lower, {'class': 'icon me-1'}) }}
 {% endif %}