diff --git a/app/javascript/styles/accounts.scss b/app/javascript/styles/accounts.scss
index 744650554c4..b51761de1b1 100644
--- a/app/javascript/styles/accounts.scss
+++ b/app/javascript/styles/accounts.scss
@@ -203,6 +203,31 @@
     color: $ui-secondary-color;
   }
 
+  .metadata {
+    margin: 15px 0;
+    border: thin $ui-base-color solid;
+    border-collapse: collapse;
+    padding: 0;
+
+    th {
+      margin: 0;
+      border: thin $ui-base-color solid;
+      padding: 0 5px;
+      color: $ui-secondary-color;
+      background: darken($ui-base-color, 8%);
+      width: 94px;
+      vertical-align: middle;
+    }
+
+    td {
+      margin: 0;
+      border: thin $ui-base-color solid;
+      padding: 0 5px;
+      color: $ui-primary-color;
+      vertical-align: middle;
+    }
+  }
+
   @media screen and (max-width: 480px) {
     display: block;
 
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
index dcc6661bac6..5b504912d39 100644
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -34,11 +34,11 @@
     .bio
       .account__header__content.p-note.emojify!=processed_bio[:text]
       - if processed_bio[:metadata].length > 0
-        .metadata<
+        %table.metadata<
           - processed_bio[:metadata].each do |i|
-            .metadata-item><
-              %b.emojify>!=i[0]
-              %span.emojify>!=i[1]
+            %tr.metadata-item><
+              %th.emojify>!=i[0]
+              %td.emojify>!=i[1]
 
     .details-counters
       .counter{ class: active_nav_class(short_account_url(account)) }