diff --git a/src/assets/scss/themes/_theme.dark_styles.scss b/src/assets/scss/themes/_theme.dark_styles.scss
index dd3d1aa1..e028b711 100644
--- a/src/assets/scss/themes/_theme.dark_styles.scss
+++ b/src/assets/scss/themes/_theme.dark_styles.scss
@@ -341,9 +341,34 @@ div.x-friend-list
     background-color: hsl($--theme-hue, $--theme-saturation, 24%);
 }
 
+.el-tag {
+    background-color: $--theme-bg-5;
+    border-color: $--theme-border-2;
+    color: $--theme-primary;
+}
+
+.el-tag.el-tag--success {
+    background-color: $--theme-bg-5;
+    border-color: $--theme-border-2;
+    color: $--theme-success;
+}
+
 .el-tag.el-tag--info {
-    background-color: $--theme-border-2;
-    border-color: hsl($--theme-hue, $--theme-saturation, 14%);
+    background-color: $--theme-bg-5;
+    border-color: $--theme-border-2;
+    color: $--theme-info;
+}
+
+.el-tag.el-tag--warning {
+    background-color: $--theme-bg-5;
+    border-color: $--theme-border-2;
+    color: $--theme-warning;
+}
+
+.el-tag.el-tag--danger {
+    background-color: $--theme-bg-5;
+    border-color: $--theme-border-2;
+    color: $--theme-danger;
 }
 
 .el-table__expanded-cell:hover {
diff --git a/src/assets/scss/themes/theme.darkvanilla.scss b/src/assets/scss/themes/theme.darkvanilla.scss
index 3861f641..2ff25497 100644
--- a/src/assets/scss/themes/theme.darkvanilla.scss
+++ b/src/assets/scss/themes/theme.darkvanilla.scss
@@ -575,8 +575,11 @@ img.friends-list-avatar {
     border-radius: var(--dv_md-rounded);
 }
 
+.el-tag,
+.el-tag.el-tag--success,
 .el-tag.el-tag--info,
-.el-tag--plain.el-tag--success {
+.el-tag.el-tag--warning,
+.el-tag.el-tag--danger {
     background-color: var(--dv_bg-bot);
 }
 
diff --git a/src/assets/scss/themes/theme.darkvanillaold.scss b/src/assets/scss/themes/theme.darkvanillaold.scss
index fef2d83e..53f76a63 100644
--- a/src/assets/scss/themes/theme.darkvanillaold.scss
+++ b/src/assets/scss/themes/theme.darkvanillaold.scss
@@ -184,7 +184,11 @@ a {
     color: var(--theme-text) !important;
 }
 
-.el-tag.el-tag--info {
+.el-tag,
+.el-tag.el-tag--success,
+.el-tag.el-tag--info,
+.el-tag.el-tag--warning,
+.el-tag.el-tag--danger {
     background: var(--farback) !important;
 }
 
diff --git a/src/assets/scss/themes/theme.material3.scss b/src/assets/scss/themes/theme.material3.scss
index a0bfa757..4b689979 100644
--- a/src/assets/scss/themes/theme.material3.scss
+++ b/src/assets/scss/themes/theme.material3.scss
@@ -1122,8 +1122,14 @@ input[type='number'],
     color: rgb(var(--md-sys-color-error));
     border-color: rgb(var(--md-sys-color-error));
 }
-.el-tag.el-tag--info {
+
+.el-tag,
+.el-tag.el-tag--success,
+.el-tag.el-tag--info,
+.el-tag.el-tag--warning,
+.el-tag.el-tag--danger {
     border-color: rgb(var(--md-sys-color-outline));
+    background-color: transparent;
 }
 
 /* Friend */
diff --git a/src/assets/scss/themes/theme.pink.scss b/src/assets/scss/themes/theme.pink.scss
index d3df4a15..36038cc2 100644
--- a/src/assets/scss/themes/theme.pink.scss
+++ b/src/assets/scss/themes/theme.pink.scss
@@ -224,9 +224,17 @@ i.el-icon-close:hover {
 }
 .el-tag.el-tag--info {
     color: #baa;
+}
+
+.el-tag,
+.el-tag.el-tag--success,
+.el-tag.el-tag--info,
+.el-tag.el-tag--warning,
+.el-tag.el-tag--danger {
     background-color: var(--lighter-lighter-bg);
     border: 1px solid var(--lighter-lighter-lighter-lighter-bg);
 }
+
 .el-collapse-item__header > span + span,
 .el-form-item__label,
 .el-pagination__total,
@@ -365,7 +373,7 @@ input[type='checkbox']:checked + .el-switch__core {
 
 .el-collapse-item .el-tag--mini {
     border: transparent;
-    background-color: #333;
+    background-color: var(--lighter-lighter-bg);
 }
 .el-divider {
     background-color: #606266;