studio - revises plus icon treatment throughout new-button actions

cms/static/sass/_base.scss

@@ -313,11 +313,6 @@ p, ul, ol, dl {
         .view-button {
 
         }
-
-        .upload-button .icon-plus {
-          @extend .t-action2;
-          line-height: 0 !important;
-        }
       }
     }
 
@@ -751,9 +746,6 @@ hr.divide {
   }
 
   .icon-plus {
-    display: inline-block;
-    vertical-align: middle;
-    margin-right: ($baseline/4);
     margin-top: -2px;
     line-height: 0;
   }

cms/static/sass/elements/_controls.scss

@@ -133,7 +133,17 @@
   }
 }
 
+// ====================
 
+// button elements
+.button {
+
+  [class^="icon-"] {
+    display: inline-block;
+    vertical-align: middle;
+    margin-right: ($baseline/4);
+  }
+}
 
 // ====================
 

cms/static/sass/views/_textbooks.scss

@@ -22,6 +22,10 @@ body.course.textbooks {
       .button {
         margin-left: $baseline;
         @include font-size(14);
+
+        [class^="icon-"] {
+          margin-right: ($baseline/2);
+        }
       }
     }