diff --git a/cms/static/coffee/src/views/module_edit.coffee b/cms/static/coffee/src/views/module_edit.coffee
index 068750c3d9..ad875294a1 100644
--- a/cms/static/coffee/src/views/module_edit.coffee
+++ b/cms/static/coffee/src/views/module_edit.coffee
@@ -74,5 +74,4 @@ class CMS.Views.ModuleEdit extends Backbone.View
     event.preventDefault()
     @$el.addClass('editing')
     @$component_editor().slideDown(150)
-    # $modalCover.show()
     @loadEdit()
diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index 56fb61f4d9..3c2d134919 100644
--- a/cms/static/sass/_base.scss
+++ b/cms/static/sass/_base.scss
@@ -6,7 +6,7 @@
 
 body {
     min-width: 980px;
-    background: #eaecf3;
+    background: rgb(240, 241, 245);
     font-size: 16px;
     line-height: 1.6;
     color: $baseFontColor;
@@ -57,12 +57,6 @@ h1 {
     }
 }
 
-.window {
-    background: #fff;
-    border-radius: 3px;
-    @include box-shadow(0 1px 1px rgba(0,0,0,0.2), 0 0 0 1px rgba(0, 0, 0, 0.1));
-}
-
 .sidebar {
     float: right;
     width: 28%;
@@ -86,7 +80,7 @@ input[type="email"],
 input[type="password"] {
     padding: 6px 8px 8px;
     @include box-sizing(border-box);
-    border: 1px solid #b0b6c2;
+    border: 1px solid $mediumGrey;
     border-radius: 2px;
     @include linear-gradient(top, rgba(255, 255, 255, 0), rgba(255, 255, 255, .3));
     background-color: #edf1f5;
@@ -140,7 +134,7 @@ code {
     min-height: 80px;
     padding: 10px;
     @include box-sizing(border-box);
-    border: 1px solid #b0b6c2;
+    border: 1px solid $mediumGrey;
     @include linear-gradient(top, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.3));
     background-color:  #edf1f5;
     @include box-shadow(0 1px 2px rgba(0, 0, 0, 0.1) inset);
@@ -190,6 +184,10 @@ code {
 
 .window {
     margin-bottom: 20px;
+    border: 1px solid $mediumGrey;
+    border-radius: 3px;
+    background: #fff;
+    @include box-shadow(0 1px 1px rgba(0, 0, 0, 0.1));
 
     .window-contents {
         padding: 20px;
@@ -197,13 +195,13 @@ code {
 
     h4 {
         padding: 6px 14px;
-        border-bottom: 1px solid #cbd1db;
+        border-bottom: 1px solid $mediumGrey;
         border-radius: 3px 3px 0 0;
-        @include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0) 70%);
-        background-color: #edf1f5;
-        @include box-shadow(0 1px 0 rgba(255, 255, 255, .7) inset);
+        @include linear-gradient(top, rgba(255, 255, 255, .4), rgba(255, 255, 255, 0));
+        background-color: $lightBluishGrey;
+        @include box-shadow(0 1px 0 rgba(255, 255, 255, 0.2) inset);
         font-size: 14px;
-        font-weight: 600;
+        text-shadow: 0 1px 0 rgba(255, 255, 255, 0.3);
     }
 
     label {
diff --git a/cms/static/sass/_cms_mixins.scss b/cms/static/sass/_cms_mixins.scss
index ff2a6bb2c3..361aa6929c 100644
--- a/cms/static/sass/_cms_mixins.scss
+++ b/cms/static/sass/_cms_mixins.scss
@@ -48,18 +48,19 @@
 }
 
 @mixin white-button {
-	@include button;
-	border: 1px solid $darkGrey;
-	border-radius: 3px;
-	@include linear-gradient(top, rgba(255, 255, 255, 0.6), rgba(255, 255, 255, 0));
-	background-color: #dfe5eb;
-	@include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset);
-	color: #778192;
-	
-	&:hover {
-		background-color: #f2f6f9;
-		color: #778192;
-	}
+  @include button;
+  border: 1px solid $mediumGrey;
+  border-radius: 3px;
+  @include linear-gradient(top, rgba(255, 255, 255, 0.6), rgba(255, 255, 255, 0));
+  background-color: #dfe5eb;
+  @include box-shadow(0 1px 0 rgba(255, 255, 255, .3) inset);
+  color: rgb(92, 103, 122);
+  text-shadow: 0 1px 0 rgba(255, 255, 255, .5);
+
+  &:hover {
+    background-color: rgb(222, 236, 247);
+    color: rgb(92, 103, 122);
+  }
 }
 
 @mixin orange-button {
@@ -88,6 +89,7 @@
 
 	&:hover {
 		background-color: #d9e3ee;
+		color: #6d788b;
 	}
 }
 
@@ -130,7 +132,7 @@
 @mixin edit-box {
 	padding: 15px 20px;
 	border-radius: 3px;
-	background-color: $lightBluishGrey;
+	background-color: $lightBluishGrey2;
 	color: #3c3c3c;
 	@include box-shadow(0 1px 0 rgba(255, 255, 255, .2) inset);
 
@@ -171,8 +173,8 @@
 }
 
 @mixin tree-view {
-	border: 1px solid #ced2db;
-	background: #edf1f5;
+	border: 1px solid $mediumGrey;
+	background: $lightGrey;
 
 	.branch {
 		margin-bottom: 10px;
@@ -232,7 +234,11 @@
 	}
 
 	a {
-		color: #2c2e33;
+		color: $baseFontColor;
+
+		&.new-unit-item {
+			color: #6d788b;
+		}
 	}
 
 	ol {
diff --git a/cms/static/sass/_courseware.scss b/cms/static/sass/_courseware.scss
index 10985d430a..ef4ddb7755 100644
--- a/cms/static/sass/_courseware.scss
+++ b/cms/static/sass/_courseware.scss
@@ -8,9 +8,10 @@ input.courseware-unit-search-input {
 	position: relative;
 	background: #fff;
 	border-radius: 3px;
-	margin: 15px 0;
+	border: 1px solid $mediumGrey;
+	margin-top: 15px;
 	padding-bottom: 12px;
-	@include box-shadow(0 1px 1px rgba(0, 0, 0, .2));
+	@include box-shadow(0 1px 1px rgba(0, 0, 0, 0.1));
 
 	&:first-child {
 		margin-top: 0;
diff --git a/cms/static/sass/_static-pages.scss b/cms/static/sass/_static-pages.scss
index 9a2d1303ec..78d6ba66d7 100644
--- a/cms/static/sass/_static-pages.scss
+++ b/cms/static/sass/_static-pages.scss
@@ -54,7 +54,7 @@
       background: url(../img/drag-handles.png) center no-repeat #fff;
 
       &:hover {
-        background: url(../img/drag-handles.png) center no-repeat $lightGrey;
+        background: url(../img/drag-handles.png) center no-repeat #fff;
       }
     }
 
diff --git a/cms/static/sass/_unit.scss b/cms/static/sass/_unit.scss
index 8f1500503e..fc84a818ca 100644
--- a/cms/static/sass/_unit.scss
+++ b/cms/static/sass/_unit.scss
@@ -142,7 +142,7 @@
   }
 
   .component {
-    border: 1px solid #d1ddec;
+    border: 1px solid $lightBluishGrey2;
     border-radius: 3px;
     background: #fff;
     @include transition(none);
@@ -157,6 +157,7 @@
     }
 
     &.editing {
+      border: 1px solid $lightBluishGrey2;
 
       .drag-handle,
       .component-actions {
@@ -172,11 +173,6 @@
       position: absolute;
       top: 7px;
       right: 9px;
-      @include transition(opacity .15s);
-
-      a {
-        color: $darkGrey;
-      }
     }
 
     .drag-handle {
@@ -188,10 +184,10 @@
       width: 15px;
       height: 100%;
       border-radius: 0 3px 3px 0;
-      border: 1px solid #d1ddec;
-      background: url(../img/white-drag-handles.png) center no-repeat #d1ddec;
+      border: 1px solid $lightBluishGrey2;
+      background: url(../img/white-drag-handles.png) center no-repeat $lightBluishGrey2;
       cursor: move;
-      @include transition(all .15s);
+      @include transition(none);
     }
   }
 
@@ -203,6 +199,7 @@
     @include edit-box;
     display: none;
     padding: 20px;
+    border-radius: 2px 2px 0 0;
     @include box-shadow(none);
 
     .metadata_edit {
diff --git a/cms/static/sass/_variables.scss b/cms/static/sass/_variables.scss
index 819c0f3229..d556ca87a9 100644
--- a/cms/static/sass/_variables.scss
+++ b/cms/static/sass/_variables.scss
@@ -20,7 +20,7 @@ $orange: #edbd3c;
 $red: #b20610;
 $green: #108614;
 $lightGrey: #edf1f5;
-$mediumGrey: #ced2db;
+$mediumGrey: #b0b6c2;
 $darkGrey: #8891a1;
 $extraDarkGrey: #3d4043;
 $paleYellow: #fffcf1;
@@ -28,4 +28,5 @@ $green: rgb(37, 184, 90);
 $brightGreen: rgb(22, 202, 87);
 $disabledGreen: rgb(124, 206, 153);
 $darkGreen: rgb(52, 133, 76);
-$lightBluishGrey: rgb(197, 207, 223);
\ No newline at end of file
+$lightBluishGrey: rgb(197, 207, 223);
+$lightBluishGrey2: rgb(213, 220, 228);