diff --git a/cms/static/sass/_base.scss b/cms/static/sass/_base.scss
index 3713f83ae3..a26d2a9ef5 100644
--- a/cms/static/sass/_base.scss
+++ b/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;
   }
diff --git a/cms/static/sass/elements/_controls.scss b/cms/static/sass/elements/_controls.scss
index 8de152892e..9571192e19 100644
--- a/cms/static/sass/elements/_controls.scss
+++ b/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);
+  }
+}
 
 // ====================
 
diff --git a/cms/static/sass/views/_textbooks.scss b/cms/static/sass/views/_textbooks.scss
index 996d4b2f93..4f6ca351fd 100644
--- a/cms/static/sass/views/_textbooks.scss
+++ b/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);
+        }
       }
     }
 
diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index 56788ea399..bdad7b7b88 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -48,7 +48,7 @@
         <h3 class="sr">Page Actions</h3>
         <ul>
           <li class="nav-item">
-            <a href="#" class="button upload-button new-button"><i class="icon-cloud-upload"></i> Upload New File</a>
+            <a href="#" class="button upload-button new-button"><i class="icon-plus"></i> Upload New File</a>
           </li>
         </ul>
       </nav>
diff --git a/cms/templates/js/no-textbooks.underscore b/cms/templates/js/no-textbooks.underscore
index a72bc1645f..b7284608b0 100644
--- a/cms/templates/js/no-textbooks.underscore
+++ b/cms/templates/js/no-textbooks.underscore
@@ -1,3 +1,3 @@
 <div class="no-textbook-content">
-    <p><%= gettext("You haven't added any textbooks to this course yet.") %><a href="#" class="button upload-button new-button"><i class="icon-plus"></i><%= gettext("Add your first textbook") %></a></p>
+    <p><%= gettext("You haven't added any textbooks to this course yet.") %><a href="#" class="button new-button"><i class="icon-plus"></i><%= gettext("Add your first textbook") %></a></p>
 </div>
diff --git a/cms/templates/textbooks.html b/cms/templates/textbooks.html
index a0da40e419..b570dd800d 100644
--- a/cms/templates/textbooks.html
+++ b/cms/templates/textbooks.html
@@ -59,7 +59,7 @@ $(function() {
         <h3 class="sr">${_("Page Actions")}</h3>
         <ul>
           <li class="nav-item">
-            <a href="#" class="button upload-button new-button"><i class="icon-cloud-upload "></i> ${_("New Textbook")}</a>
+            <a href="#" class="button new-button"><i class="icon-plus"></i> ${_("New Textbook")}</a>
           </li>
         </ul>
       </nav>