diff --git a/src/fonts/cartoIcon.eot b/src/fonts/cartoIcon.eot
index e2ab33d..fad8006 100644
Binary files a/src/fonts/cartoIcon.eot and b/src/fonts/cartoIcon.eot differ
diff --git a/src/fonts/cartoIcon.ttf b/src/fonts/cartoIcon.ttf
index 1e375d4..b40f494 100644
Binary files a/src/fonts/cartoIcon.ttf and b/src/fonts/cartoIcon.ttf differ
diff --git a/src/fonts/cartoIcon.woff b/src/fonts/cartoIcon.woff
index cd9dcf8..4aea4a3 100644
Binary files a/src/fonts/cartoIcon.woff and b/src/fonts/cartoIcon.woff differ
diff --git a/src/scss/cdb-components/tags.scss b/src/scss/cdb-components/tags.scss
index ec60e43..90b409a 100644
--- a/src/scss/cdb-components/tags.scss
+++ b/src/scss/cdb-components/tags.scss
@@ -20,6 +20,7 @@
 ```
 */
 
+@import '../cdb-utilities/mixins';
 @import '../cdb-variables/sizes';
 @import '../cdb-variables/colors';
 
@@ -50,14 +51,47 @@
 # Tags / Metadata
 
 ```
-<button class="CDB-Metadata CDB-Text u-iBlock">
-  population
-</button>
+<ul class="CDB-ListMetadata CDB-Text CDB-Size-medium u-secondaryTextColor">
+  <li class="CDB-ListMetadata-item">
+    <button class="CDB-Metadata CDB-Text">
+      trees
+      <div class="CDB-Shape u-lSpace">
+        <div class="CDB-Shape-close is-blue is-large"></div>
+      </div>
+    </button>
+  </li>
+  <li class="CDB-ListMetadata-item">
+    <button class="CDB-Metadata CDB-Text">
+      table_merge
+      <div class="CDB-Shape u-lSpace">
+        <div class="CDB-Shape-close is-blue is-large"></div>
+      </div>
+    </button>
+  </li>
+  <li class="CDB-ListMetadata-item">
+    <button class="CDB-Metadata CDB-Text">
+      word
+      <div class="CDB-Shape u-lSpace">
+        <div class="CDB-Shape-close is-blue is-large"></div>
+      </div>
+    </button>
+  </li>
+</ul>
 
 ```
 */
 
-.CDB-Metadata {
-  border-radius: $baseSize / 2;
-  background: #FF5500;
+.CDB-ListMetadata {
+  @include display-flex();
+}
+
+.CDB-ListMetadata-item {
+  margin-right: $baseSize;
+}
+
+.CDB-Metadata {
+  @include display-flex();
+  padding: $baseSize / 2 $baseSize / 2  $baseSize / 2 $baseSize;
+  border-radius: $baseSize / 2;
+  background: rgba($cBlue, 0.16);
 }