diff --git a/cms/static/sass/views/_static-pages.scss b/cms/static/sass/views/_static-pages.scss
index 8dae7f3c7e..5a586bc3af 100644
--- a/cms/static/sass/views/_static-pages.scss
+++ b/cms/static/sass/views/_static-pages.scss
@@ -2,7 +2,7 @@
 // ====================
 
 body.course.static-pages {
-  
+
   .new-static-page-button {
     @include grey-button;
     display: block;
@@ -43,8 +43,8 @@ body.course.static-pages {
       display: none;
       padding: 0;
       border-radius: 2px 2px 0 0;
-      
-      //Overrides general edit-box mixin 
+
+      //Overrides general edit-box mixin
       .row {
         margin-bottom: 0px;
       }
@@ -56,7 +56,7 @@ body.course.static-pages {
         background-color: $gray-l6;
 
         .save-button {
-        margin: 15px 8px 0 0;
+        margin: ($baseline/2) 8px 0 0;
         }
       }
     }
diff --git a/cms/static/sass/views/_unit.scss b/cms/static/sass/views/_unit.scss
index e2330d045d..3fa9663e77 100644
--- a/cms/static/sass/views/_unit.scss
+++ b/cms/static/sass/views/_unit.scss
@@ -464,7 +464,7 @@ body.course.unit {
         background-color: $gray-l6;
 
         .save-button {
-        margin: 15px 8px 0 0;
+        margin: ($baseline/2) 8px 0 0;
         }
       }
 
@@ -487,11 +487,14 @@ body.course.unit {
   //Component Name
   .component-name {
     @extend .t-copy-sub1;
-    color: $white;
     width: 50%;
+    color: $white;
+    font-weight: 600;
 
     em {
-      font-weight: 600;
+      display: inline-block;
+      margin-right: ($baseline/4);
+      font-weight: 400;
       color: $white;
     }
   }
@@ -502,7 +505,7 @@ body.course.unit {
     right: 0;
     top: 0;
     position: absolute;
-    padding: 15px;
+    padding: 12px ($baseline*0.75);
 
     .mode {
       display: inline-block;
@@ -517,15 +520,15 @@ body.course.unit {
         @include blue-button;
 
         &.is-set {
+          @include transition(box-shadow 0.5 ease-in-out);
           @include linear-gradient($blue, $blue);
           color: $blue-d1;
-          box-shadow: inset 0 1px 2px 2px $shadow;
+          box-shadow: inset 0 1px 2px 1px $shadow-l1;
           background-color: $blue-d4;
           cursor: default;
 
           &:hover {
-            box-shadow: inset 0 1px 2px 2px  $shadow;
-            background-color: $blue-d4;
+            box-shadow: inset 0 1px 2px 1px  $shadow;
           }
         }
       }
diff --git a/common/lib/xmodule/xmodule/css/problem/edit.scss b/common/lib/xmodule/xmodule/css/problem/edit.scss
index b7c8bdaba5..249b767e5e 100644
--- a/common/lib/xmodule/xmodule/css/problem/edit.scss
+++ b/common/lib/xmodule/xmodule/css/problem/edit.scss
@@ -5,7 +5,7 @@
     .advanced-toggle {
       @include white-button;
       height: auto;
-      margin-top: -1px;
+      margin-top: -4px;
       padding: 3px 9px;
       font-size: 12px;
 
@@ -16,7 +16,7 @@
         color: $darkGrey !important;
         pointer-events: none;
         cursor: none;
-        
+
         &:hover {
           box-shadow: 0 0 0 0 !important;
         }
@@ -27,7 +27,7 @@
       width: 21px;
       height: 21px;
       padding: 0;
-      margin: 0 5px 0 15px;
+      margin: -1px 5px 0 15px;
       border-radius: 22px;
       border: 1px solid #a5aaaf;
       background: #e5ecf3;