diff --git a/app/styles/layout/admin-project-values.scss b/app/styles/layout/admin-project-values.scss
index a7b44b10..749d7178 100644
--- a/app/styles/layout/admin-project-values.scss
+++ b/app/styles/layout/admin-project-values.scss
@@ -24,7 +24,7 @@
     background: $whitish;
     display: flex;
     justify-content: space-between;
-    padding: .5rem 1rem;
+    padding: .8em 1rem;
     text-transform: uppercase;
     h2 {
         margin: 0;
diff --git a/app/styles/modules/admin/admin-custom-attributes.scss b/app/styles/modules/admin/admin-custom-attributes.scss
index d110cf23..a6ba34fa 100644
--- a/app/styles/modules/admin/admin-custom-attributes.scss
+++ b/app/styles/modules/admin/admin-custom-attributes.scss
@@ -4,26 +4,31 @@
 }
 
 .custom-fields-table {
+    margin-bottom: 2em;
     .row {
         border-bottom: 0;
         padding: .5rem 0;
-
     }
     .table-header {
         @extend %bold;
-        border-bottom: 1px solid $gray-light;
+        border-bottom: 3px solid $whitish;
         .custom-name span,
         .custom-description span {
             padding-left: 1.1rem;
         }
     }
     .table-body {
+        form:last-child {
+            .row {
+                border: 0;
+            }
+        }
         .row:hover {
             background: rgba($fresh-taiga, .05);
             cursor: move;
             transition: background .2s linear;
             .icon-drag-v,
-            .custom-options-wrapper {
+            .custom-options {
                 opacity: 1;
                 transition: opacity .2s linear;
             }
@@ -72,6 +77,7 @@
         flex-basis: 100px;
         flex-grow: 0;
         flex-shrink: 0;
+        opacity: 0;
         text-align: center;
         a {
             color: $gray-light;
diff --git a/app/styles/modules/admin/project-values.scss b/app/styles/modules/admin/project-values.scss
index 9f96b6ee..e8920a8f 100644
--- a/app/styles/modules/admin/project-values.scss
+++ b/app/styles/modules/admin/project-values.scss
@@ -21,9 +21,16 @@
 
 .project-values-header {
     @extend %bold;
-    border-bottom: 2px solid $gray-light;
+    border-bottom: 3px solid $whitish;
 }
 .project-values-body {
+    form {
+        &:last-child {
+            .project-values-row {
+                border: 0;
+            }
+        }
+    }
     .project-values-row {
         &:hover {
             background: lighten($green-taiga, 60%);
diff --git a/app/styles/modules/common/colors-table.scss b/app/styles/modules/common/colors-table.scss
index 1da52861..f84a0d6e 100644
--- a/app/styles/modules/common/colors-table.scss
+++ b/app/styles/modules/common/colors-table.scss
@@ -2,7 +2,7 @@
     .table-header {
         @extend %medium;
         @extend %bold;
-        border-bottom: 2px solid $gray-light;
+        border-bottom: 3px solid $whitish;
         &:hover {
             background: transparent;
         }
@@ -10,17 +10,40 @@
             padding-left: 50px;
         }
     }
+    form {
+        &:last-child {
+            .row {
+                border: 0;
+            }
+        }
+    }
     .row {
         align-items: center;
+        border-bottom: 1px solid $whitish;
         display: flex;
         justify-content: center;
         padding: 1rem;
         &:hover {
+            background: lighten($green-taiga, 60%);
+            cursor: move;
+            transition: background .2s ease-in;
+            .icon {
+                opacity: 1;
+                transition: opacity .2s ease-in;
+            }
             .options-column {
                 opacity: 1;
                 transition: opacity .3s linear;
             }
         }
+        &:last-child {
+            border: 0;
+        }
+        &.edition {
+            .current-color {
+                cursor: pointer;
+            }
+        }
         &.edition,
         &.new-value {
             padding-left: 50px;
@@ -28,11 +51,6 @@
         &.hidden {
             display: none;
         }
-        &.edition {
-            .current-color {
-                cursor: pointer;
-            }
-        }
         .color-column {
             flex-basis: 60px;
             flex-grow: 1;
@@ -86,18 +104,7 @@
             opacity: 1;
         }
     }
-    .table-main {
-        border-bottom: 1px solid $whitish;
-        .row:hover {
-            background: lighten($green-taiga, 60%);
-            cursor: move;
-            transition: background .2s ease-in;
-            .icon {
-                opacity: 1;
-                transition: opacity .2s ease-in;
-            }
-        }
-    }
+
     .current-color {
         background-color: $gray-light;
         border-radius: 2px;