diff --git a/app/assets/stylesheets/components/navigation.scss b/app/assets/stylesheets/components/navigation.scss
index d6c3531d7..388cfffb7 100644
--- a/app/assets/stylesheets/components/navigation.scss
+++ b/app/assets/stylesheets/components/navigation.scss
@@ -23,6 +23,10 @@
       right: 0;
       padding: 13px 0 9px 15px;
 
+      &:hover {
+        color: $link-hover-colour;
+      }
+
       &:focus {
         outline: none;
         border-bottom: 4px solid $yellow;
diff --git a/app/assets/stylesheets/components/table.scss b/app/assets/stylesheets/components/table.scss
index 9de3550e6..cd9b1643f 100644
--- a/app/assets/stylesheets/components/table.scss
+++ b/app/assets/stylesheets/components/table.scss
@@ -212,8 +212,49 @@
 }
 
 .table-field-right-aligned {
+
   @extend %table-field;
   text-align: right;
+
+  a {
+
+    display: block;
+    position: relative;
+
+    &:before {
+      content: "";
+      display: block;
+
+      position: absolute;
+
+      top: -$gutter-half;
+      right: 0;
+      bottom: -$gutter-half + 4px;
+      left: -$gutter-half;
+
+      background: transparent;
+    }
+
+    &:hover {
+      color: $link-hover-colour;
+    }
+
+    &:active,
+    &:focus {
+
+      color: $black;
+
+      &:before {
+        border-color: $yellow;
+        border-style: solid;
+        border-width: 15px 3px 15px 15px;
+        right: -3px;
+      }
+
+    }
+
+  }
+
 }
 
 
diff --git a/app/assets/stylesheets/components/tick-cross.scss b/app/assets/stylesheets/components/tick-cross.scss
index 4cf3f1151..7189a4be8 100644
--- a/app/assets/stylesheets/components/tick-cross.scss
+++ b/app/assets/stylesheets/components/tick-cross.scss
@@ -57,10 +57,48 @@
     }
 
     &-edit-link {
+
       text-align: right;
       position: absolute;
       top: -25px;
       right: -135px;
+
+      a {
+
+        &:before {
+          content: "";
+          display: block;
+
+          position: absolute;
+
+          top: -$gutter-half - 1;
+          right: 0;
+          bottom: -$gutter-half;
+          left: -$gutter-half;
+
+          background: transparent;
+        }
+
+        &:hover {
+          color: $link-hover-colour;
+        }
+
+        &:active,
+        &:focus {
+
+          color: $black;
+
+          &:before {
+            border-color: $yellow;
+            border-style: solid;
+            border-width: 15px 3px 15px 15px;
+            right: -3px;
+          }
+
+        }
+
+      }
+
     }
 
     &-hint {
diff --git a/app/templates/views/user-profile.html b/app/templates/views/user-profile.html
index 9950af7c5..24f3cdc02 100644
--- a/app/templates/views/user-profile.html
+++ b/app/templates/views/user-profile.html
@@ -10,40 +10,42 @@
 
   <h1 class="heading-large">Your profile</h1>
 
-  {% call mapping_table(
-    caption='Your profile',
-    field_headings=['Label', 'Value', 'Action'],
-    field_headings_visible=False,
-    caption_visible=False
-  ) %}
-    {% call row() %}
-      {{ text_field('Name') }}
-      {{ text_field(current_user.name) }}
-      {{ edit_field('Change', url_for('.user_profile_name')) }}
-    {% endcall %}
+  <div class="body-copy-table">
+    {% call mapping_table(
+      caption='Your profile',
+      field_headings=['Label', 'Value', 'Action'],
+      field_headings_visible=False,
+      caption_visible=False
+    ) %}
+      {% call row() %}
+        {{ text_field('Name') }}
+        {{ text_field(current_user.name) }}
+        {{ edit_field('Change', url_for('.user_profile_name')) }}
+      {% endcall %}
 
-    {% call row() %}
-      {{ text_field('Email address') }}
-      {{ text_field(current_user.email_address) }}
-      {% if can_see_edit %}
-        {{ edit_field('Change', url_for('.user_profile_email')) }}
-      {% else %}
-        {{ text_field('') }}
-      {% endif %}
-    {% endcall %}
+      {% call row() %}
+        {{ text_field('Email address') }}
+        {{ text_field(current_user.email_address) }}
+        {% if can_see_edit %}
+          {{ edit_field('Change', url_for('.user_profile_email')) }}
+        {% else %}
+          {{ text_field('') }}
+        {% endif %}
+      {% endcall %}
 
-    {% call row() %}
-      {{ text_field('Mobile number') }}
-      {{ optional_text_field(current_user.mobile_number) }}
-      {{ edit_field('Change', url_for('.user_profile_mobile_number')) }}
-    {% endcall %}
+      {% call row() %}
+        {{ text_field('Mobile number') }}
+        {{ optional_text_field(current_user.mobile_number) }}
+        {{ edit_field('Change', url_for('.user_profile_mobile_number')) }}
+      {% endcall %}
 
-    {% call row() %}
-      {{ text_field('Password') }}
-      {{ text_field('Last changed ' + current_user.password_changed_at|format_delta) }}
-      {{ edit_field('Change', url_for('.user_profile_password')) }}
-    {% endcall %}
+      {% call row() %}
+        {{ text_field('Password') }}
+        {{ text_field('Last changed ' + current_user.password_changed_at|format_delta) }}
+        {{ edit_field('Change', url_for('.user_profile_password')) }}
+      {% endcall %}
 
-  {% endcall %}
+    {% endcall %}
+  </div>
 
 {% endblock %}