diff --git a/components/lib/tag/Tag.vue b/components/lib/tag/Tag.vue
index 5143acd73..454d06bde 100644
--- a/components/lib/tag/Tag.vue
+++ b/components/lib/tag/Tag.vue
@@ -2,7 +2,7 @@
     <span :class="cx('root')" v-bind="ptm('root')" data-pc-name="tag">
         <component v-if="$slots.icon" :is="$slots.icon" :class="cx('icon')" v-bind="ptm('icon')" />
         <span v-else-if="icon" :class="[cx('icon'), icon]" v-bind="ptm('icon')"></span>
-        <slot>
+        <slot v-if="value || $slots.default">
             <span :class="cx('value')" v-bind="ptm('value')">{{ value }}</span>
         </slot>
     </span>
diff --git a/public/themes/arya-blue/theme.css b/public/themes/arya-blue/theme.css
index 793fbe743..a4391bf44 100644
--- a/public/themes/arya-blue/theme.css
+++ b/public/themes/arya-blue/theme.css
@@ -5730,9 +5730,11 @@
     color: #121212;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/arya-green/theme.css b/public/themes/arya-green/theme.css
index 95d72adaa..44430affc 100644
--- a/public/themes/arya-green/theme.css
+++ b/public/themes/arya-green/theme.css
@@ -5730,9 +5730,11 @@
     color: #121212;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/arya-orange/theme.css b/public/themes/arya-orange/theme.css
index ea2e876b7..5a1a46cce 100644
--- a/public/themes/arya-orange/theme.css
+++ b/public/themes/arya-orange/theme.css
@@ -5730,9 +5730,11 @@
     color: #121212;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/arya-purple/theme.css b/public/themes/arya-purple/theme.css
index 4b9d8573e..b60009101 100644
--- a/public/themes/arya-purple/theme.css
+++ b/public/themes/arya-purple/theme.css
@@ -5730,9 +5730,11 @@
     color: #121212;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/bootstrap4-dark-blue/theme.css b/public/themes/bootstrap4-dark-blue/theme.css
index 337c9cec8..a8fda8e11 100644
--- a/public/themes/bootstrap4-dark-blue/theme.css
+++ b/public/themes/bootstrap4-dark-blue/theme.css
@@ -5742,9 +5742,11 @@
     color: #151515;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/bootstrap4-dark-purple/theme.css b/public/themes/bootstrap4-dark-purple/theme.css
index e664bce80..48f33706b 100644
--- a/public/themes/bootstrap4-dark-purple/theme.css
+++ b/public/themes/bootstrap4-dark-purple/theme.css
@@ -5742,9 +5742,11 @@
     color: #151515;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/bootstrap4-light-blue/theme.css b/public/themes/bootstrap4-light-blue/theme.css
index fb97cb6aa..831cab4d2 100644
--- a/public/themes/bootstrap4-light-blue/theme.css
+++ b/public/themes/bootstrap4-light-blue/theme.css
@@ -5742,9 +5742,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/bootstrap4-light-purple/theme.css b/public/themes/bootstrap4-light-purple/theme.css
index 6ba848ddb..d54638df1 100644
--- a/public/themes/bootstrap4-light-purple/theme.css
+++ b/public/themes/bootstrap4-light-purple/theme.css
@@ -5742,9 +5742,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/fluent-light/theme.css b/public/themes/fluent-light/theme.css
index f2033d3a3..97bf8f39b 100644
--- a/public/themes/fluent-light/theme.css
+++ b/public/themes/fluent-light/theme.css
@@ -5681,9 +5681,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/lara-dark-amber/theme.css b/public/themes/lara-dark-amber/theme.css
index b05f5682d..f6526fd9a 100644
--- a/public/themes/lara-dark-amber/theme.css
+++ b/public/themes/lara-dark-amber/theme.css
@@ -5700,9 +5700,11 @@
     color: #450a0a;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/lara-dark-blue/theme.css b/public/themes/lara-dark-blue/theme.css
index ff53c2ea1..92c98801c 100644
--- a/public/themes/lara-dark-blue/theme.css
+++ b/public/themes/lara-dark-blue/theme.css
@@ -5700,9 +5700,11 @@
     color: #450a0a;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/lara-dark-cyan/theme.css b/public/themes/lara-dark-cyan/theme.css
index a80e1c477..158bc7496 100644
--- a/public/themes/lara-dark-cyan/theme.css
+++ b/public/themes/lara-dark-cyan/theme.css
@@ -5700,9 +5700,11 @@
     color: #450a0a;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/lara-dark-green/theme.css b/public/themes/lara-dark-green/theme.css
index bbcddb79c..8eff2e546 100644
--- a/public/themes/lara-dark-green/theme.css
+++ b/public/themes/lara-dark-green/theme.css
@@ -5700,9 +5700,11 @@
     color: #450a0a;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/lara-dark-indigo/theme.css b/public/themes/lara-dark-indigo/theme.css
index 106d88e2f..5d2315044 100644
--- a/public/themes/lara-dark-indigo/theme.css
+++ b/public/themes/lara-dark-indigo/theme.css
@@ -5700,9 +5700,11 @@
     color: #450a0a;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/lara-dark-pink/theme.css b/public/themes/lara-dark-pink/theme.css
index 74c4cc900..2d007ebba 100644
--- a/public/themes/lara-dark-pink/theme.css
+++ b/public/themes/lara-dark-pink/theme.css
@@ -5700,9 +5700,11 @@
     color: #450a0a;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/lara-dark-purple/theme.css b/public/themes/lara-dark-purple/theme.css
index e85d9d9a5..9349eb00f 100644
--- a/public/themes/lara-dark-purple/theme.css
+++ b/public/themes/lara-dark-purple/theme.css
@@ -5700,9 +5700,11 @@
     color: #450a0a;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/lara-dark-teal/theme.css b/public/themes/lara-dark-teal/theme.css
index 0bc53e1a1..6a532f087 100644
--- a/public/themes/lara-dark-teal/theme.css
+++ b/public/themes/lara-dark-teal/theme.css
@@ -5700,9 +5700,11 @@
     color: #450a0a;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/lara-light-amber/theme.css b/public/themes/lara-light-amber/theme.css
index 45e57a6a6..e7aa85876 100644
--- a/public/themes/lara-light-amber/theme.css
+++ b/public/themes/lara-light-amber/theme.css
@@ -5700,9 +5700,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/lara-light-blue/theme.css b/public/themes/lara-light-blue/theme.css
index ba9b99f73..995550daf 100644
--- a/public/themes/lara-light-blue/theme.css
+++ b/public/themes/lara-light-blue/theme.css
@@ -5700,9 +5700,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/lara-light-cyan/theme.css b/public/themes/lara-light-cyan/theme.css
index d21f6c903..a6b664770 100644
--- a/public/themes/lara-light-cyan/theme.css
+++ b/public/themes/lara-light-cyan/theme.css
@@ -5700,9 +5700,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/lara-light-green/theme.css b/public/themes/lara-light-green/theme.css
index 7211aec1f..96870cb58 100644
--- a/public/themes/lara-light-green/theme.css
+++ b/public/themes/lara-light-green/theme.css
@@ -5700,9 +5700,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/lara-light-indigo/theme.css b/public/themes/lara-light-indigo/theme.css
index 67abcbdcb..44bd17945 100644
--- a/public/themes/lara-light-indigo/theme.css
+++ b/public/themes/lara-light-indigo/theme.css
@@ -5700,9 +5700,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/lara-light-pink/theme.css b/public/themes/lara-light-pink/theme.css
index e51a09ec1..7c0fbf4d3 100644
--- a/public/themes/lara-light-pink/theme.css
+++ b/public/themes/lara-light-pink/theme.css
@@ -5700,9 +5700,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/lara-light-purple/theme.css b/public/themes/lara-light-purple/theme.css
index 347690701..ea7e7f51e 100644
--- a/public/themes/lara-light-purple/theme.css
+++ b/public/themes/lara-light-purple/theme.css
@@ -5700,9 +5700,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/lara-light-teal/theme.css b/public/themes/lara-light-teal/theme.css
index c3cb6acdf..e898e2b84 100644
--- a/public/themes/lara-light-teal/theme.css
+++ b/public/themes/lara-light-teal/theme.css
@@ -5700,9 +5700,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/luna-amber/theme.css b/public/themes/luna-amber/theme.css
index 180467968..54ee88a12 100644
--- a/public/themes/luna-amber/theme.css
+++ b/public/themes/luna-amber/theme.css
@@ -5693,9 +5693,11 @@
     color: #212529;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/luna-blue/theme.css b/public/themes/luna-blue/theme.css
index 11660b821..94f38ded3 100644
--- a/public/themes/luna-blue/theme.css
+++ b/public/themes/luna-blue/theme.css
@@ -5693,9 +5693,11 @@
     color: #212529;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/luna-green/theme.css b/public/themes/luna-green/theme.css
index 26101b8ec..d1d223fd4 100644
--- a/public/themes/luna-green/theme.css
+++ b/public/themes/luna-green/theme.css
@@ -5693,9 +5693,11 @@
     color: #212529;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/luna-pink/theme.css b/public/themes/luna-pink/theme.css
index d591847b9..10211aa47 100644
--- a/public/themes/luna-pink/theme.css
+++ b/public/themes/luna-pink/theme.css
@@ -5693,9 +5693,11 @@
     color: #212529;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/md-dark-deeppurple/theme.css b/public/themes/md-dark-deeppurple/theme.css
index 36e828158..ff20df2af 100644
--- a/public/themes/md-dark-deeppurple/theme.css
+++ b/public/themes/md-dark-deeppurple/theme.css
@@ -5754,9 +5754,11 @@
     color: #212121;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/md-dark-indigo/theme.css b/public/themes/md-dark-indigo/theme.css
index b906caf51..c2b1b0c40 100644
--- a/public/themes/md-dark-indigo/theme.css
+++ b/public/themes/md-dark-indigo/theme.css
@@ -5754,9 +5754,11 @@
     color: #212121;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/md-light-deeppurple/theme.css b/public/themes/md-light-deeppurple/theme.css
index 8f333084c..73779ca16 100644
--- a/public/themes/md-light-deeppurple/theme.css
+++ b/public/themes/md-light-deeppurple/theme.css
@@ -5754,9 +5754,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/md-light-indigo/theme.css b/public/themes/md-light-indigo/theme.css
index 03e2e84ff..ef81c38ab 100644
--- a/public/themes/md-light-indigo/theme.css
+++ b/public/themes/md-light-indigo/theme.css
@@ -5754,9 +5754,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/mdc-dark-deeppurple/theme.css b/public/themes/mdc-dark-deeppurple/theme.css
index 68e189d15..92d10eab9 100644
--- a/public/themes/mdc-dark-deeppurple/theme.css
+++ b/public/themes/mdc-dark-deeppurple/theme.css
@@ -5754,9 +5754,11 @@
     color: #212121;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/mdc-dark-indigo/theme.css b/public/themes/mdc-dark-indigo/theme.css
index 14eec58d5..9d377a027 100644
--- a/public/themes/mdc-dark-indigo/theme.css
+++ b/public/themes/mdc-dark-indigo/theme.css
@@ -5754,9 +5754,11 @@
     color: #212121;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/mdc-light-deeppurple/theme.css b/public/themes/mdc-light-deeppurple/theme.css
index a55375fca..d67cbcdde 100644
--- a/public/themes/mdc-light-deeppurple/theme.css
+++ b/public/themes/mdc-light-deeppurple/theme.css
@@ -5754,9 +5754,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/mdc-light-indigo/theme.css b/public/themes/mdc-light-indigo/theme.css
index 38738975c..bae603ca2 100644
--- a/public/themes/mdc-light-indigo/theme.css
+++ b/public/themes/mdc-light-indigo/theme.css
@@ -5754,9 +5754,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/mira/theme.css b/public/themes/mira/theme.css
index 0dacb2e91..b6a7c200b 100644
--- a/public/themes/mira/theme.css
+++ b/public/themes/mira/theme.css
@@ -5758,9 +5758,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/nano/theme.css b/public/themes/nano/theme.css
index 61ac4a732..3dd327957 100644
--- a/public/themes/nano/theme.css
+++ b/public/themes/nano/theme.css
@@ -5730,9 +5730,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/nova-accent/theme.css b/public/themes/nova-accent/theme.css
index ea903cce2..aeaa09505 100644
--- a/public/themes/nova-accent/theme.css
+++ b/public/themes/nova-accent/theme.css
@@ -5681,9 +5681,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/nova-alt/theme.css b/public/themes/nova-alt/theme.css
index ccd6aa1c8..1326a7755 100644
--- a/public/themes/nova-alt/theme.css
+++ b/public/themes/nova-alt/theme.css
@@ -5693,9 +5693,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/nova-vue/theme.css b/public/themes/nova-vue/theme.css
index 35a2a3765..1340a12cb 100644
--- a/public/themes/nova-vue/theme.css
+++ b/public/themes/nova-vue/theme.css
@@ -5693,9 +5693,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/nova/theme.css b/public/themes/nova/theme.css
index 9ff67ae06..256d0cbe4 100644
--- a/public/themes/nova/theme.css
+++ b/public/themes/nova/theme.css
@@ -5693,9 +5693,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/rhea/theme.css b/public/themes/rhea/theme.css
index 37785fa3f..eb2799eab 100644
--- a/public/themes/rhea/theme.css
+++ b/public/themes/rhea/theme.css
@@ -5681,9 +5681,11 @@
     color: #262222;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/saga-blue/theme.css b/public/themes/saga-blue/theme.css
index 9e7701523..de26ab46f 100644
--- a/public/themes/saga-blue/theme.css
+++ b/public/themes/saga-blue/theme.css
@@ -5730,9 +5730,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/saga-green/theme.css b/public/themes/saga-green/theme.css
index ef1e61f6e..6c1368a0c 100644
--- a/public/themes/saga-green/theme.css
+++ b/public/themes/saga-green/theme.css
@@ -5730,9 +5730,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/saga-orange/theme.css b/public/themes/saga-orange/theme.css
index d702d5bce..e40771d73 100644
--- a/public/themes/saga-orange/theme.css
+++ b/public/themes/saga-orange/theme.css
@@ -5730,9 +5730,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/saga-purple/theme.css b/public/themes/saga-purple/theme.css
index 9e8a92141..0200bf3ea 100644
--- a/public/themes/saga-purple/theme.css
+++ b/public/themes/saga-purple/theme.css
@@ -5730,9 +5730,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/soho-dark/theme.css b/public/themes/soho-dark/theme.css
index 9151277af..4779ed24a 100644
--- a/public/themes/soho-dark/theme.css
+++ b/public/themes/soho-dark/theme.css
@@ -5705,9 +5705,11 @@
     color: #1d1e27;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/soho-light/theme.css b/public/themes/soho-light/theme.css
index cac4b5791..d5dfeac24 100644
--- a/public/themes/soho-light/theme.css
+++ b/public/themes/soho-light/theme.css
@@ -5705,9 +5705,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/tailwind-light/theme.css b/public/themes/tailwind-light/theme.css
index b3e3bb2b2..1f03e199b 100644
--- a/public/themes/tailwind-light/theme.css
+++ b/public/themes/tailwind-light/theme.css
@@ -5765,9 +5765,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/vela-blue/theme.css b/public/themes/vela-blue/theme.css
index cb8aee875..18495664b 100644
--- a/public/themes/vela-blue/theme.css
+++ b/public/themes/vela-blue/theme.css
@@ -5730,9 +5730,11 @@
     color: #121212;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/vela-green/theme.css b/public/themes/vela-green/theme.css
index 75dbda3d0..4d36a5411 100644
--- a/public/themes/vela-green/theme.css
+++ b/public/themes/vela-green/theme.css
@@ -5730,9 +5730,11 @@
     color: #121212;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/vela-orange/theme.css b/public/themes/vela-orange/theme.css
index 04a76d1a3..efc36edea 100644
--- a/public/themes/vela-orange/theme.css
+++ b/public/themes/vela-orange/theme.css
@@ -5730,9 +5730,11 @@
     color: #121212;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/vela-purple/theme.css b/public/themes/vela-purple/theme.css
index a473f6511..fa1bcbd91 100644
--- a/public/themes/vela-purple/theme.css
+++ b/public/themes/vela-purple/theme.css
@@ -5730,9 +5730,11 @@
     color: #121212;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/viva-dark/theme.css b/public/themes/viva-dark/theme.css
index 71a5fbadc..0d6147261 100644
--- a/public/themes/viva-dark/theme.css
+++ b/public/themes/viva-dark/theme.css
@@ -5762,9 +5762,11 @@
     color: #0e1315;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;
diff --git a/public/themes/viva-light/theme.css b/public/themes/viva-light/theme.css
index 97081bd3f..9465b98cd 100644
--- a/public/themes/viva-light/theme.css
+++ b/public/themes/viva-light/theme.css
@@ -5762,9 +5762,11 @@
     color: #ffffff;
   }
   .p-tag .p-tag-icon {
-    margin-right: 0.25rem;
     font-size: 0.75rem;
   }
+  .p-tag .p-tag-icon:not(:last-child) {
+    margin-right: 0.25rem;
+  }
   .p-tag .p-tag-icon.p-icon {
     width: 0.75rem;
     height: 0.75rem;