diff --git a/app/assets/stylesheets/components/tick-cross.scss b/app/assets/stylesheets/components/tick-cross.scss
index b3a90660a..74fc461ab 100644
--- a/app/assets/stylesheets/components/tick-cross.scss
+++ b/app/assets/stylesheets/components/tick-cross.scss
@@ -1,6 +1,6 @@
 %tick-cross {
 
-  @include core-16;
+  @include core-19;
   display: inline-block;
   background-size: 19px 19px;
   background-repeat: no-repeat;
diff --git a/app/assets/stylesheets/views/users.scss b/app/assets/stylesheets/views/users.scss
index 0d774388a..b04cd671d 100644
--- a/app/assets/stylesheets/views/users.scss
+++ b/app/assets/stylesheets/views/users.scss
@@ -1,6 +1,6 @@
 .user-list {
 
-  @include core-16;
+  @include core-19;
   margin-bottom: $gutter * 1.5;
 
   &-item {
diff --git a/app/templates/views/api/keys.html b/app/templates/views/api/keys.html
index 6dbb99f44..44bbdf177 100644
--- a/app/templates/views/api/keys.html
+++ b/app/templates/views/api/keys.html
@@ -19,41 +19,43 @@
       <a href="{{ url_for('.create_api_key', service_id=current_service.id) }}" class="button align-with-heading">Create an API key</a>
     </div>
   </div>
-  {% call(item, row_number) list_table(
-    keys,
-    empty_message="You haven’t created any API keys yet",
-    caption="API keys",
-    caption_visible=false,
-    field_headings=[
-      'API keys',
-      'Action'
-    ],
-    field_headings_visible=False
-  ) %}
-    {% call field() %}
-      <div class="file-list">
-        {{ item.name }}
-        <span class="file-list-hint">
-          {% if item.key_type == 'normal' %}
-            Live – sends to anyone
-          {% elif item.key_type == 'team' %}
-            Team and whitelist – limits who you can send to
-          {% elif item.key_type == 'test' %}
-            Test – pretends to send messages
-          {% endif %}
-        </span>
-      </div>
+  <div class="body-copy-table">
+    {% call(item, row_number) list_table(
+      keys,
+      empty_message="You haven’t created any API keys yet",
+      caption="API keys",
+      caption_visible=false,
+      field_headings=[
+        'API keys',
+        'Action'
+      ],
+      field_headings_visible=False
+    ) %}
+      {% call field() %}
+        <div class="file-list">
+          {{ item.name }}
+          <div class="hint">
+            {% if item.key_type == 'normal' %}
+              Live – sends to anyone
+            {% elif item.key_type == 'team' %}
+              Team and whitelist – limits who you can send to
+            {% elif item.key_type == 'test' %}
+              Test – pretends to send messages
+            {% endif %}
+          </div>
+        </div>
+      {% endcall %}
+      {% if item.expiry_date %}
+        {% call field(align='right') %}
+          <span class='hint'>Revoked {{ item.expiry_date|format_datetime_short }}</span>
+        {% endcall %}
+      {% else %}
+        {% call field(align='right', status='error') %}
+          <a href='{{ url_for('.revoke_api_key', service_id=current_service.id, key_id=item.id) }}'>Revoke</a>
+        {% endcall %}
+      {% endif %}
     {% endcall %}
-    {% if item.expiry_date %}
-      {% call field(align='right') %}
-        <span class='hint'>Revoked {{ item.expiry_date|format_datetime_short }}</span>
-      {% endcall %}
-    {% else %}
-      {% call field(align='right', status='error') %}
-        <a href='{{ url_for('.revoke_api_key', service_id=current_service.id, key_id=item.id) }}'>Revoke</a>
-      {% endcall %}
-    {% endif %}
-  {% endcall %}
+  </div>
 
   {{ page_footer(
     secondary_link=url_for('.api_integration', service_id=current_service.id),
diff --git a/app/templates/views/service-settings.html b/app/templates/views/service-settings.html
index 22328e672..b25b93875 100644
--- a/app/templates/views/service-settings.html
+++ b/app/templates/views/service-settings.html
@@ -11,7 +11,7 @@
 
     <h1 class="heading-large">Settings</h1>
 
-    <div class="bottom-gutter-3-2">
+    <div class="bottom-gutter-3-2 body-copy-table">
 
       {% call mapping_table(
         caption='Settings',