diff --git a/templates/pages/roaster.html b/templates/pages/roaster.html
index 8ee1762..c0eb0c8 100644
--- a/templates/pages/roaster.html
+++ b/templates/pages/roaster.html
@@ -30,7 +30,9 @@
         <div>
           <dt class="text-text-muted">Country</dt>
           <dd class="font-medium text-text">
-            {% if !roaster.country_flag.is_empty() %}{{ roaster.country_flag }}{% endif %}{{ roaster.country }}
+            {% if !roaster.country_flag.is_empty() %}
+              <span class="mr-1">{{ roaster.country_flag }}</span>
+            {% endif %}{{ roaster.country }}
           </dd>
         </div>
         {% if let Some(c) = roaster.city %}
diff --git a/templates/partials/detail_cards.html b/templates/partials/detail_cards.html
index e256746..6b716ff 100644
--- a/templates/partials/detail_cards.html
+++ b/templates/partials/detail_cards.html
@@ -62,7 +62,9 @@
         <div>
           <dt class="text-text-muted">Origin</dt>
           <dd class="font-medium text-text">
-            {% if !origin_flag.is_empty() %}{{ origin_flag }}{% endif %}{{ origin }}
+            {% if !origin_flag.is_empty() %}
+              <span class="mr-1">{{ origin_flag }}</span>
+            {% endif %}{{ origin }}
           </dd>
         </div>
       {% endif %}
@@ -202,7 +204,9 @@
       <div>
         <dt class="text-text-muted">Country</dt>
         <dd class="font-medium text-text">
-          {% if !country_flag.is_empty() %}{{ country_flag }}{% endif %}{{ country }}
+          {% if !country_flag.is_empty() %}
+            <span class="mr-1">{{ country_flag }}</span>
+          {% endif %}{{ country }}
         </dd>
       </div>
       {% if let Some(c) = city %}
diff --git a/templates/partials/lists/cafe_list.html b/templates/partials/lists/cafe_list.html
index f023d07..82184c6 100644
--- a/templates/partials/lists/cafe_list.html
+++ b/templates/partials/lists/cafe_list.html
@@ -71,7 +71,9 @@
                   data-label="Location"
                   class="px-4 py-3 whitespace-nowrap md:hidden"
                 >
-                  {% if !cafe.country_flag.is_empty() %}{{ cafe.country_flag }}{% endif %}{{ cafe.country }}
+                  {% if !cafe.country_flag.is_empty() %}
+                    <span class="mr-1">{{ cafe.country_flag }}</span>
+                  {% endif %}{{ cafe.country }}
                 </td>
                 <td
                   data-label="City"
@@ -83,7 +85,9 @@
                   data-label="Country"
                   class="mobile-hidden px-4 py-3 whitespace-nowrap"
                 >
-                  {% if !cafe.country_flag.is_empty() %}{{ cafe.country_flag }}{% endif %}{{ cafe.country }}
+                  {% if !cafe.country_flag.is_empty() %}
+                    <span class="mr-1">{{ cafe.country_flag }}</span>
+                  {% endif %}{{ cafe.country }}
                 </td>
                 <td
                   data-label="City"
diff --git a/templates/partials/lists/roast_list.html b/templates/partials/lists/roast_list.html
index 68667eb..49e9194 100644
--- a/templates/partials/lists/roast_list.html
+++ b/templates/partials/lists/roast_list.html
@@ -75,7 +75,9 @@
                   {{ roast.roaster_label }}
                 </td>
                 <td data-label="Origin" class="px-4 py-3 whitespace-nowrap">
-                  {% if !roast.origin_flag.is_empty() %}{{ roast.origin_flag }}{% endif %}{{ roast.origin }}
+                  {% if !roast.origin_flag.is_empty() %}
+                    <span class="mr-1">{{ roast.origin_flag }}</span>
+                  {% endif %}{{ roast.origin }}
                   {% if !roast.producer.is_empty() %}
                     <div class="hidden md:block text-xs text-text-muted">
                       {{ roast.producer }}
diff --git a/templates/partials/lists/roaster_list.html b/templates/partials/lists/roaster_list.html
index a4eda08..5ef54e9 100644
--- a/templates/partials/lists/roaster_list.html
+++ b/templates/partials/lists/roaster_list.html
@@ -71,7 +71,9 @@
                   data-label="Location"
                   class="px-4 py-3 whitespace-nowrap md:hidden"
                 >
-                  {% if !roaster.country_flag.is_empty() %}{{ roaster.country_flag }}{% endif %}{{ roaster.country }}
+                  {% if !roaster.country_flag.is_empty() %}
+                    <span class="mr-1">{{ roaster.country_flag }}</span>
+                  {% endif %}{{ roaster.country }}
                 </td>
                 {% if !roaster.city.is_empty() %}
                   <td
@@ -85,7 +87,9 @@
                   data-label="Country"
                   class="mobile-hidden px-4 py-3 whitespace-nowrap"
                 >
-                  {% if !roaster.country_flag.is_empty() %}{{ roaster.country_flag }}{% endif %}{{ roaster.country }}
+                  {% if !roaster.country_flag.is_empty() %}
+                    <span class="mr-1">{{ roaster.country_flag }}</span>
+                  {% endif %}{{ roaster.country }}
                 </td>
                 <td
                   data-label="City"