diff --git a/app/assets/javascripts/repositories/repository_datatable.js b/app/assets/javascripts/repositories/repository_datatable.js
index a097d22d4..7df350c5a 100644
--- a/app/assets/javascripts/repositories/repository_datatable.js
+++ b/app/assets/javascripts/repositories/repository_datatable.js
@@ -48,6 +48,7 @@ var RepositoryDatatable = (function(global) {
   // Enable/disable edit button
   function updateButtons() {
     if (currentMode === 'viewMode') {
+      $(TABLE_WRAPPER).removeClass('editing')
       $('#saveCancel').hide();
       $('#editDeleteCopy').show();
       $('#addRepositoryRecord').prop('disabled', false);
@@ -76,6 +77,7 @@ var RepositoryDatatable = (function(global) {
         $('#unassignRepositoryRecords').prop('disabled', false);
       }
     } else if (currentMode === 'editMode') {
+      $(TABLE_WRAPPER).addClass('editing')
       $('#editDeleteCopy').hide();
       $('#saveCancel').show();
       $('#repository-acitons-dropdown').prop('disabled', true);
@@ -534,6 +536,7 @@ var RepositoryDatatable = (function(global) {
         visible: true,
         searchable: false,
         orderable: true,
+        className: 'assigned-column',
         sWidth: '1%',
         render: function(data) {
           let content = data;
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 3a28a9d3e..974d7675e 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -29,6 +29,8 @@
 @import "my_modules/protocols/*";
 @import "my_modules/results/*";
 @import "protocols/*";
+@import "repository/*";
+@import "repository_columns/*";
 @import "settings/*";
 @import "shared/*";
 @import "themes/*";
diff --git a/app/assets/stylesheets/repositories.scss b/app/assets/stylesheets/repositories.scss
index 9cc414257..74c014706 100644
--- a/app/assets/stylesheets/repositories.scss
+++ b/app/assets/stylesheets/repositories.scss
@@ -39,38 +39,6 @@
   }
 }
 
-.repository-table {
-  margin-top: 20px;
-
-  // Datatables generated name
-  .dataTables_length {
-    display: inline-block;
-    float: right;
-    margin-left: 10px;
-  }
-
-  .dataTables_filter {
-    float: right;
-  }
-
-  // hack only for firefox
-  @-moz-document url-prefix() {
-    input.form-control[type="file"] {
-      font-size: 13px;
-      height: auto;
-      padding: 3px 12px;
-    }
-  }
-
-  .repository-status-value-icon {
-    margin-right: 5px;
-  }
-
-  .dropdown-selector-container {
-    width: 150px;
-  }
-}
-
 .repository-cog {
   display: inline-block;
   float: right;
diff --git a/app/assets/stylesheets/repository/repository_table.scss b/app/assets/stylesheets/repository/repository_table.scss
index 9d28a4ce0..74ed46445 100644
--- a/app/assets/stylesheets/repository/repository_table.scss
+++ b/app/assets/stylesheets/repository/repository_table.scss
@@ -4,8 +4,54 @@
 @import "constants";
 
 .repository-table {
+  margin-top: 20px;
+
+  // Datatables generated name
+  .dataTables_length {
+    display: inline-block;
+    float: right;
+    margin-left: 10px;
+  }
+
+  .dataTables_filter {
+    float: right;
+  }
+
+  // hack only for firefox
+  @-moz-document url-prefix() {
+    input.form-control[type="file"] {
+      font-size: 13px;
+      height: auto;
+      padding: 3px 12px;
+    }
+  }
+
+  .repository-status-value-icon {
+    margin-right: 5px;
+  }
+
+  .dropdown-selector-container {
+    width: 150px;
+  }
+
+
   // Cells
 
+
+  // Assigned
+
+  .assigned-column {
+    .repository-row-edit-icon {
+      cursor: pointer;
+      display: none;
+      width: 30px;
+    }
+
+    .circle-icon {
+      margin-left: 30px;
+    }
+  }
+
   // Checklists
   .checklist-dropdown {
     .dropdown-menu {
@@ -27,4 +73,42 @@
       display: none;
     }
   }
+
+  // Actions
+
+  tbody {
+    tr:hover {
+      background-color: $color-concrete;
+
+      .assigned-column {
+        .repository-row-edit-icon {
+          display: inline-block;
+        }
+
+        .circle-icon {
+          margin-left: 0;
+        }
+      }
+    }
+
+    .editing {
+      border: 1px solid;
+    }
+  }
+
+  &.editing {
+    tbody {
+      tr:hover {
+        .assigned-column {
+          .repository-row-edit-icon {
+            display: none;
+          }
+
+          .circle-icon {
+            margin-left: 30px;
+          }
+        }
+      }
+    }
+  }
 }
diff --git a/app/assets/stylesheets/themes/repositories.scss b/app/assets/stylesheets/themes/repositories.scss
index 04ddc7230..26d5d388d 100644
--- a/app/assets/stylesheets/themes/repositories.scss
+++ b/app/assets/stylesheets/themes/repositories.scss
@@ -83,28 +83,6 @@
   }
 }
 
-.repository-table {
-  tbody {
-    tr:hover {
-      background-color: $color-concrete;
-    }
-
-    .editing {
-      border: 1px solid;
-    }
-
-    .repository-row-edit-icon {
-      opacity: 0;
-      padding-right: 10px;
-    }
-
-    tr:hover .repository-row-edit-icon {
-      cursor: pointer;
-      opacity: 1;
-    }
-  }
-}
-
 .new-input-file-field-div {
   display: flex;
   flex-direction: row;