diff --git a/scss/elements/_block_lists.scss b/scss/elements/_block_lists.scss
index abf51e03..e7caed75 100644
--- a/scss/elements/_block_lists.scss
+++ b/scss/elements/_block_lists.scss
@@ -58,6 +58,10 @@
 
 .block-list__header {
   @include block-list-header;
+
+  .block-list__header__link {
+    @include icon-link;
+  }
 }
 
 .block-list__title {
diff --git a/scss/elements/_icon_link.scss b/scss/elements/_icon_link.scss
index 334c21c4..95e372ec 100644
--- a/scss/elements/_icon_link.scss
+++ b/scss/elements/_icon_link.scss
@@ -1,4 +1,18 @@
+@mixin icon-link-color($color: $color-blue, $hover-color: $color-aqua-lightest) {
+  color: $color;
+
+  &:hover {
+    background-color: $hover-color;
+    color: $color;
+  }
+
+  .icon {
+    @include icon-color($color);
+  }
+}
+
 @mixin icon-link {
+  @include icon-link-color($color-primary);
   @include h5;
   display: inline-flex;
   flex-direction: row;
@@ -16,6 +30,16 @@
   }
 }
 
+@mixin icon-link-large {
+  @include h4;
+  font-weight: normal;
+
+  .icon {
+    @include icon-size(16);
+    margin-right: $gap * 2;
+  }
+}
+
 @mixin icon-link-vertical {
   flex-direction: column;
 
@@ -24,19 +48,6 @@
   }
 }
 
-@mixin icon-link-color($color: $color-blue, $hover-color: $color-aqua-lightest) {
-  color: $color;
-
-  &:hover {
-    background-color: $hover-color;
-    color: $color;
-  }
-
-  .icon {
-    @include icon-color($color);
-  }
-}
-
 .icon-link {
   @include icon-link;
   @include icon-link-color($color-primary);
@@ -44,4 +55,8 @@
   &.icon-link--vertical {
     @include icon-link-vertical;
   }
+
+  &.icon-link--large {
+    @include icon-link-large;
+  }
 }
diff --git a/scss/elements/_inputs.scss b/scss/elements/_inputs.scss
index 2f3cf594..f303a66c 100644
--- a/scss/elements/_inputs.scss
+++ b/scss/elements/_inputs.scss
@@ -202,11 +202,15 @@ select {
     flex-grow: 1;
 
     &:first-child .usa-input {
-      margin-top: 0;
+      &:first-child {
+        margin-top: 0;
+      }
     }
 
     &:last-child .usa-input {
-      margin-bottom: 0;
+      &:first-child {
+        margin-top: 0;
+      }
     }
   }
 
@@ -216,7 +220,8 @@ select {
 
     .form-col {
       .usa-input {
-        margin: 0 ($gap * 4);
+        margin-left: ($gap * 4);
+        margin-right: ($gap * 4);
       }
 
       &:first-child {
diff --git a/scss/elements/_tables.scss b/scss/elements/_tables.scss
index 5971be8f..e1602dfd 100644
--- a/scss/elements/_tables.scss
+++ b/scss/elements/_tables.scss
@@ -8,44 +8,54 @@
   @include panel-margin;
   min-width: 100%;
 
-  tr {
-    th,
-    td {
-      white-space: nowrap;
-    }
-
-    th {
-      @include block-list-header;
-      display: table-cell;
-    }
-
-    td {
-      @include block-list-item;
-      display: table-cell;
-    }
-
-    &:last-child {
+  tbody {
+    tr {
+      th,
       td {
-        border-bottom-style: solid;
+        @include block-list-item;
+        display: table-cell;
+        white-space: nowrap;
+        border-bottom-style: dashed;
+        border-top: none;
+
+        &:last-child {
+          border-bottom-style: dashed;
+        }
+      }
+
+      &:last-child {
+        td,
+        th {
+          border-bottom-style: solid;
+        }
+      }
+
+      .table-cell--align-right {
+        text-align: right;
+      }
+
+      .table-cell--shrink {
+        width: 1%;
+      }
+
+      .table-cell--expand {
+        width: 100%;
+      }
+
+      .table-cell--hide-small {
+        display: none;
+
+        @include media($medium-screen) {
+          display: table-cell;
+        }
       }
     }
+  }
 
-    .table-cell--align-right {
-      text-align: right;
-    }
-
-    .table-cell--shrink {
-      width: 1%;
-    }
-
-    .table-cell--expand {
-      width: 100%;
-    }
-
-    .table-cell--hide-small {
-      display: none;
-
-      @include media($medium-screen) {
+  thead {
+    tr {
+      th {
+        @include block-list-header;
         display: table-cell;
       }
     }
diff --git a/scss/sections/_projects_list.scss b/scss/sections/_projects_list.scss
index 5472ee29..fe62b7a6 100644
--- a/scss/sections/_projects_list.scss
+++ b/scss/sections/_projects_list.scss
@@ -5,19 +5,8 @@
     justify-content: space-between;
 
     .project-list-item__environment__link {
-      text-decoration: none;
-      display: flex;
-      flex-direction: row;
-      align-items: center;
-
-      .icon {
-        @include icon-color($color-primary);
-        margin-right: $gap;
-      }
-
-      span {
-        text-decoration: underline;
-      }
+      @include icon-link;
+      @include icon-link-large;
     }
 
     .project-list-item__environment__members {
diff --git a/static/icons/edit.svg b/static/icons/edit.svg
new file mode 100644
index 00000000..66a02956
--- /dev/null
+++ b/static/icons/edit.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path d="M15 16H1c-.552 0-1-.447-1-1V1c0-.552.448-1 1-1h10v2H2v12h12V5h2v10c0 .553-.447 1-1 1zM5 12c-.256 0-.512-.098-.707-.293-.391-.391-.391-1.023 0-1.414l10-10c.391-.391 1.023-.391 1.414 0s.391 1.023 0 1.414l-10 10C5.512 11.902 5.256 12 5 12z"/></svg>
diff --git a/templates/request_approval.html.to b/templates/request_approval.html.to
index db81049a..142a1951 100644
--- a/templates/request_approval.html.to
+++ b/templates/request_approval.html.to
@@ -177,7 +177,10 @@
     <div class='action-group'>
       <a href='/' class='usa-button usa-button-big'>Approve Request</a>
       <a href='/' class='usa-button usa-button-big usa-button-secondary'>Deny Request</a>
-      <a href='/'>Cancel</a>
+      <a href='/' class='icon-link'>
+        {% module Icon('x') %}
+        <span>Cancel</span>
+      </a>
     </div>
   </form>
 </article>
diff --git a/templates/requests.html.to b/templates/requests.html.to
index d801de0a..756c4bbc 100644
--- a/templates/requests.html.to
+++ b/templates/requests.html.to
@@ -60,40 +60,38 @@
     </div>
   </div>
 
-  <div class="panel">
-    <div class='responsive-table-wrapper'>
-      <table>
-        <thead>
-          <tr>
-            <th scope="col">Order ID</th>
-            <th scope="col">Request Date</th>
-            <th scope="col">Requester</th>
-            <th scope="col">Total Apps</th>
-            <th scope="col">Status</th>
-            <th scope="col">Actions</th>
-          </tr>
-        </thead>
-        <tbody>
-          {% for r in requests %}
-          <tr>
-            <th scope="row">
-              <a href="{{ reverse_url('request_form_update', 1, r['order_id']) if r["status"] != "approved" else reverse_url('financial_verification', r['order_id']) }}">{{ r['order_id'] }}</a>
-              {% if r['is_new'] %}<span class="usa-label">New</span>
-            </th>
-            {% end %}
-            <td>{{ r['date'] }}</td>
-            <td>{{ r['full_name'] }}</td>
-            <td>{{ r['app_count'] }}</td>
-            <td>{{ r['status'] }}</td>
-            <td>
-              <a href="">Download</a>
-              <a href="/request/approval">Approval</a>
-            </td>
-          </tr>
+  <div class='responsive-table-wrapper'>
+    <table>
+      <thead>
+        <tr>
+          <th scope="col">Order ID</th>
+          <th scope="col">Request Date</th>
+          <th scope="col">Requester</th>
+          <th scope="col">Total Apps</th>
+          <th scope="col">Status</th>
+          <th scope="col" class="table-cell--shrink">Actions</th>
+        </tr>
+      </thead>
+      <tbody>
+        {% for r in requests %}
+        <tr>
+          <th scope="row">
+            <a class='icon-link icon-link--large' href="{{ reverse_url('request_form_update', 1, r['order_id']) if r["status"] != "approved" else reverse_url('financial_verification', r['order_id']) }}">{{ r['order_id'] }}</a>
+            {% if r['is_new'] %}<span class="usa-label">New</span>
+          </th>
           {% end %}
-        </tbody>
-      </table>
-    </div>
+          <td>{{ r['date'] }}</td>
+          <td>{{ r['full_name'] }}</td>
+          <td>{{ r['app_count'] }}</td>
+          <td>{{ r['status'] }}</td>
+          <td class="table-cell--shrink">
+            <a href="" class='icon-link'>Download</a>
+            <a href="/request/approval" class='icon-link'>Approval</a>
+          </td>
+        </tr>
+        {% end %}
+      </tbody>
+    </table>
   </div>
 </div>
 
diff --git a/templates/workspace_members.html.to b/templates/workspace_members.html.to
index e1e407ff..c32e292c 100644
--- a/templates/workspace_members.html.to
+++ b/templates/workspace_members.html.to
@@ -39,7 +39,7 @@
       <thead>
         <tr>
           <th scope="col" width="50%">Name</th>
-          <th scope="col">&nbsp;<span class="hide">Status Flag</span></th>
+          <th scope="col" class='table-cell--shrink'>&nbsp;<span class="hide">Status Flag</span></th>
           <th scope="col">Status</th>
           <th scope="col">Workspace Role</th>
         </tr>
@@ -47,8 +47,8 @@
       <tbody>
         {% for m in members %}
         <tr>
-          <td><a href="#">{{ m['first_name'] }} {{ m['last_name'] }}</a></td>
-          <td>{% if m['num_projects'] == '0' %} <span class="label label--info">No Project Access</span> {% end %}</td>
+          <td><a href="#" class="icon-link icon-link--large">{{ m['first_name'] }} {{ m['last_name'] }}</a></td>
+          <td class='table-cell--shrink'>{% if m['num_projects'] == '0' %} <span class="label label--info">No Project Access</span> {% end %}</td>
           <td>{{ m['status'] }}</a></td>
           <td>{{ m['workspace_role'] }}</a></td>
         </tr>
diff --git a/templates/workspace_projects.html.to b/templates/workspace_projects.html.to
index bd3a0c5b..e4008c3c 100644
--- a/templates/workspace_projects.html.to
+++ b/templates/workspace_projects.html.to
@@ -6,7 +6,10 @@
   <div class='block-list project-list-item'>
     <header class='block-list__header'>
       <h2 class='block-list__title'>{{ project['name'] }} ({{ len(project['environments'])}} environments)</h2>
-      <a class='block-list__header__link' href='/workspaces/123456/projects/789/edit'>edit</a>
+      <a class='block-list__header__link' href='/workspaces/123456/projects/789/edit'>
+        {% module Icon('edit') %}
+        <span>edit</span>
+      </a>
     </header>
     <ul>
       {% for environment in project['environments'] %}