diff --git a/ui/app/styles/core/buttons.scss b/ui/app/styles/core/buttons.scss
index 41a90d585..d0b996211 100644
--- a/ui/app/styles/core/buttons.scss
+++ b/ui/app/styles/core/buttons.scss
@@ -5,6 +5,7 @@ $button-box-shadow-standard: 0 2px 0 0 rgba($grey, 0.2);
   box-shadow: $button-box-shadow-standard;
   border: 1px solid transparent;
   text-decoration: none;
+  line-height: 1;
 
   &:hover,
   &.is-hovered {
diff --git a/ui/app/styles/core/forms.scss b/ui/app/styles/core/forms.scss
index 2dbed30e7..70135eaf5 100644
--- a/ui/app/styles/core/forms.scss
+++ b/ui/app/styles/core/forms.scss
@@ -40,4 +40,30 @@
   &.is-inline {
     display: inline-block;
   }
+
+  &:not(:last-child) {
+    margin-bottom: 1rem;
+  }
+}
+
+.form {
+  &.is-small {
+    font-size: 0.85rem;
+
+    .label {
+      font-size: 0.85rem;
+    }
+  }
+
+  .label {
+    font-weight: $weight-medium;
+  }
+
+  .group-heading {
+    text-transform: uppercase;
+    letter-spacing: 0.05ch;
+    margin-bottom: 1.5em;
+    color: $grey;
+    font-weight: $weight-medium;
+  }
 }
diff --git a/ui/app/styles/core/icon.scss b/ui/app/styles/core/icon.scss
index 40492bb6f..3a4973125 100644
--- a/ui/app/styles/core/icon.scss
+++ b/ui/app/styles/core/icon.scss
@@ -12,8 +12,12 @@ $icon-dimensions-large: 2rem;
   width: $icon-dimensions;
   fill: $text;
 
-  &.is-small,
   &.is-text {
+    width: 1.2em;
+    height: 1.2em;
+  }
+
+  &.is-small {
     height: $icon-dimensions-small;
     width: $icon-dimensions-small;
   }