diff --git a/assets/styles/main.scss b/assets/styles/main.scss
index 5b0779d30..61cc21c48 100644
--- a/assets/styles/main.scss
+++ b/assets/styles/main.scss
@@ -34,12 +34,6 @@ $easeOut: cubic-bezier(0.19, 1, 0.22, 1);
   background: #fff;
 }
 
-.tags {
-  .ds-tag {
-    margin-right: $space-xx-small;
-  }
-}
-
 blockquote {
   display: block;
   padding: 15px 20px 15px 45px;
diff --git a/styleguide/src/system/components/typography/Tag/style.scss b/styleguide/src/system/components/typography/Tag/style.scss
index 48256e8fe..76cad1505 100644
--- a/styleguide/src/system/components/typography/Tag/style.scss
+++ b/styleguide/src/system/components/typography/Tag/style.scss
@@ -1,11 +1,12 @@
 .ds-tag {
   @include reset;
   @include stack-space($space-xx-small);
+  @include inline-space($font-space-xx-small);
   display: inline-block;
   font-family: $font-family-text;
   line-height: $line-height-large;
   padding: $font-space-xx-small $font-space-x-large;
-  padding-top: $font-space-xxx-small;
+  padding-top: $font-space-x-small;
   border-radius: $border-radius-base;
   font-weight: $font-weight-bold;
   letter-spacing: $letter-spacing-large;
@@ -42,15 +43,19 @@
 .ds-tag-round {
   border-radius: $border-radius-rounded;
   padding: 0 $font-space-base;
+  padding-top: $font-space-xxx-small;
 }
 
 .ds-tag-size-base {
   font-size: $font-size-x-small;
+  padding-top: $font-space-x-small;
+  padding-bottom: $font-space-xx-small;
 }
 
 .ds-tag-size-small {
   font-size: $font-size-xx-small;
   padding: $font-space-xxx-small $font-space-large;
+  padding-top: $font-space-x-small;
 }
 
 .ds-tag-size-large {