diff --git a/cms/static/sass/views/_assets.scss b/cms/static/sass/views/_assets.scss
index c37ec1771a..3647f6ae47 100644
--- a/cms/static/sass/views/_assets.scss
+++ b/cms/static/sass/views/_assets.scss
@@ -34,10 +34,6 @@ body.course.uploads {
       width: 100%;
       word-wrap: break-word;
 
-
-      thead tr {
-      }
-
       th {
         @extend %t-copy-sub2;
         background-color: $gray-l5;
@@ -82,15 +78,6 @@ body.course.uploads {
             background-image: url('../img/bg-micro-stripes.png');
             background-position: 0 0;
             background-repeat: repeat;
-
-            .locked a {
-              background-color: $gray;
-              color: $white;
-
-              &:hover {
-                background-color: $blue;
-              }
-            }
           }
 
           &:hover {
@@ -102,49 +89,21 @@ body.course.uploads {
               color: $gray;
             }
           }
-
-
         }
 
-        .thumb-cols {
-          padding: ($baseline/2) $baseline;
-          width: 100px;
-        }
+      .thumb-col {
+        padding: ($baseline/2) $baseline;
 
-        .name-cols {
-          width: ($baseline*12.5);
-        }
-
-        .date-cols {
-          width: ($baseline*5);
-        }
-
-        .embed-cols {
-          width: ($baseline*10);
-        }
-
-        .actions-cols {
-          width: ($baseline*3);
-          padding: ($baseline/2);
-        }
-
-        .thumb-col {
-          overflow: hidden;
-
-          .thumb {
-            width: ($baseline*5);
-
-            img {
-              width: 100%;
-            }
+          img {
+            width: 100%;
           }
         }
 
+
         .name-col {
-          @extend %t-copy-sub1;
-          text-overflow: ellipsis;
 
           .title {
+            @extend %t-copy-sub1;
             display: inline-block;
             max-width: 200px;
             overflow: hidden;
@@ -163,6 +122,7 @@ body.course.uploads {
           color: $gray-l2;
 
           .embeddable-xml-input {
+            @include transition(all $tmg-f2 ease-in-out 0s);
             @extend %t-copy-sub2;
             box-shadow: none;
             border: none;
@@ -179,6 +139,7 @@ body.course.uploads {
         }
 
         .actions-col {
+          padding: ($baseline/2);
           text-align: center;
         }
       }
@@ -207,14 +168,67 @@ body.course.uploads {
       display: inline-block;
       vertical-align: bottom;
     }
-  }
 
 
+    &.action-lock {
+      position: relative;
+    }
+
+    &.action-lock label {
+      position: absolute;
+      top: 0;
+      right: 0;
+      height: 30px;
+      width: 30px;
+
+      &:hover {
+        background-color: $blue;
+      }
+    }
+
+    &.action-lock .lock-checkbox {
+      position: absolute;
+      top: 0;
+      right: 0;
+      height: 30px;
+      width: 30px;
+      opacity: 0;
+    }
+
+    &.action-lock .lock-checkbox:hover ~ .action-button {
+      background-color: $blue;
+      color: $gray-l6;
+    }
+
+    &.action-lock .lock-checkbox ~ .action-button {
+      .icon-lock {
+        display: none;
+      }
+
+      .icon-unlock-alt {
+        display: inline-block;
+      }
+    }
+
+    &.action-lock .lock-checkbox:checked ~ .action-button {
+      background-color: $gray;
+      color: $white;
+
+      .icon-lock {
+        display: inline-block;
+      }
+
+     .icon-unlock-alt {
+        display: none;
+      }
+    }
+
+  }
+
   .show-xml {
     @include blue-button;
   }
 
-
   .upload-modal {
     display: none;
     width: 640px !important;
diff --git a/cms/templates/js/asset.underscore b/cms/templates/js/asset.underscore
index 4116189a6f..7d83935448 100644
--- a/cms/templates/js/asset.underscore
+++ b/cms/templates/js/asset.underscore
@@ -18,17 +18,13 @@
 </td>
 <td class="actions-col">
     <ul>
-        <li class="action-item">
+        <li class="action-item action-delete">
             <a href="#" data-tooltip="<%= gettext('Delete this asset') %>" class="remove-asset-button action-button"><i class="icon-remove-sign"></i> <span class="sr"><%= gettext('Delete this asset') %></span></a>
         </li>
-        <% if (locked) { %>
-        <li class="action-item locked">
-            <a href="#" data-tooltip="<%= gettext('Unlock this asset') %>" class="lock-asset-button action-button"><i class="icon-lock"></i> <span class="sr"><%= gettext('Unlock this asset') %></span></a>
+        <li class="action-item action-lock">
+            <label for="lock-asset"><span class="sr"><%= gettext('Lock this asset') %></span></label>
+            <input type="checkbox" name="lock-asset" class="lock-checkbox" data-tooltip="<%= gettext('Lock/unlock file') %>" />
+            <div class="action-button"><i class="icon-lock"></i><i class="icon-unlock-alt"></i></div>
         </li>
-        <% } else { %>
-        <li class="action-item">
-            <a href="#" data-tooltip="<%= gettext('Lock this asset') %>" class="lock-asset-button action-button"><i class="icon-unlock-alt"></i> <span class="sr"><%= gettext('Lock this asset') %></span></a>
-        </li>
-        <% }%>
     </ul>
 </td>