diff --git a/layouts/joomla/content/tags.php b/layouts/joomla/content/tags.php
index 6c057ef4b6a0c..138a5bb0898e4 100644
--- a/layouts/joomla/content/tags.php
+++ b/layouts/joomla/content/tags.php
@@ -22,7 +22,7 @@
 		<?php foreach ($displayData as $i => $tag) : ?>
 			<?php if (in_array($tag->access, $authorised)) : ?>
 				<?php $tagParams = new Registry($tag->params); ?>
-				<?php $link_class = $tagParams->get('tag_link_class', 'badge bg-info'); ?>
+				<?php $link_class = $tagParams->get('tag_link_class', 'btn btn-info btn-sm'); ?>
 				<li class="list-inline-item tag-<?php echo $tag->tag_id; ?> tag-list<?php echo $i; ?>" itemprop="keywords">
 					<a href="<?php echo Route::_(RouteHelper::getTagRoute($tag->tag_id . ':' . $tag->alias)); ?>" class="<?php echo $link_class; ?>">
 						<?php echo $this->escape($tag->title); ?>
diff --git a/templates/cassiopeia/scss/blocks/_tags.scss b/templates/cassiopeia/scss/blocks/_tags.scss
new file mode 100644
index 0000000000000..248e0770aeab8
--- /dev/null
+++ b/templates/cassiopeia/scss/blocks/_tags.scss
@@ -0,0 +1,15 @@
+// Tags
+
+.tags {
+  .list-inline-item {
+    margin-bottom: .5rem;
+  }
+  a.btn {
+    font-weight: 700;
+  }
+}
+
+.tag {
+  display: inline-block;
+  padding: .5rem 0;
+}
diff --git a/templates/cassiopeia/scss/template.scss b/templates/cassiopeia/scss/template.scss
index 02645df16c698..cb1e8e1dce3b1 100644
--- a/templates/cassiopeia/scss/template.scss
+++ b/templates/cassiopeia/scss/template.scss
@@ -27,6 +27,7 @@
 @import "blocks/modifiers";
 @import "blocks/utilities";
 @import "blocks/legacy";
+@import "blocks/tags";
 @import "blocks/css-grid"; // Last to allow fallback
 
 // Vendor overrides