diff --git a/lms/static/sass/_discussion-old.scss b/lms/static/sass/_discussion-old.scss
index 01380faa77..8d1152cbcc 100644
--- a/lms/static/sass/_discussion-old.scss
+++ b/lms/static/sass/_discussion-old.scss
@@ -68,7 +68,10 @@
     width: 16px;
     height: 17px;
     margin: 7px 7px 0 0;
-    background: url(../images/new-post-icon.png) no-repeat;
+    font-size: 16px;
+    padding-right: $baseline/2;
+    vertical-align: middle;
+    color: $white;
   }
 
   .post-search {
diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index 408812de83..da52a72abf 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -129,7 +129,10 @@ body.discussion {
       width: 16px;
       height: 17px;
       margin: 8px 7px 0 0;
-      background: url(../images/new-post-icon.png) no-repeat;
+      font-size: 16px;
+      padding-right: $baseline/2;
+      vertical-align: middle;
+      color: $white;
     }
   }
 
@@ -1414,7 +1417,7 @@ body.discussion {
   }
 
   .helpgrid-row-navigation {
-    .icon-sort-down {color: $light-gray;}
+    .icon-reorder {color: $light-gray;}
     .icon-search {color: $light-gray;}
     .icon-sort {color: $light-gray;}
   }
@@ -2304,7 +2307,10 @@ body.discussion {
     width: 16px;
     height: 17px;
     margin: 8px 7px 0 0;
-    background: url(../images/new-post-icon.png) no-repeat;
+    font-size: 16px;
+    padding-right: $baseline/2;
+    vertical-align: middle;
+    color: $white;
   }
 
   .moderator-actions {
@@ -2603,13 +2609,8 @@ body.discussion {
       float:right;
       padding-right: 5px;
       font-style: italic;
-<<<<<<< HEAD
-      cursor:pointer;
-      margin-right: 10px;
-=======
       cursor:pointer; 
       margin-right: $baseline/2;
->>>>>>> cleaned up margin and padding to use baseline variable
       opacity: 0.8;
 
       span {
diff --git a/lms/templates/discussion/_discussion_course_navigation.html b/lms/templates/discussion/_discussion_course_navigation.html
index d770cacc96..55d9087f7b 100644
--- a/lms/templates/discussion/_discussion_course_navigation.html
+++ b/lms/templates/discussion/_discussion_course_navigation.html
@@ -3,6 +3,6 @@
 
 <%block name="extratabs">
 % if has_permission(user, 'create_thread', course.id):
-    <li class="right"><a href="#" class="new-post-btn"><span class="new-post-icon"></span>New Post</a></li>
+    <li class="right"><a href="#" class="new-post-btn"><span class="icon icon-edit"></span>New Post</a></li>
 % endif
 </%block>
\ No newline at end of file
diff --git a/lms/templates/discussion/_discussion_module.html b/lms/templates/discussion/_discussion_module.html
index 8fced92f7f..ef836e0b77 100644
--- a/lms/templates/discussion/_discussion_module.html
+++ b/lms/templates/discussion/_discussion_module.html
@@ -2,7 +2,7 @@
 
 <div class="discussion-module" data-discussion-id="${discussion_id | h}">
     <a class="discussion-show control-button" href="javascript:void(0)" data-discussion-id="${discussion_id | h}"><span class="show-hide-discussion-icon"></span><span class="button-text">Show Discussion</span></a>
-    <a href="#" class="new-post-btn"><span class="new-post-icon"></span>New Post</a>
+    <a href="#" class="new-post-btn"><span class="icon icon-edit new-post-icon"></span>New Post</a>
     
     
 </div>
diff --git a/lms/templates/discussion/index.html b/lms/templates/discussion/index.html
index 5e1b50910e..9ca613e6cc 100644
--- a/lms/templates/discussion/index.html
+++ b/lms/templates/discussion/index.html
@@ -56,7 +56,7 @@
 		        		<li class="helpgrid-row helpgrid-row-navigation">
 		        			<span class="row-title">Find discussions</span>
 		        			<div class="row-item">
-		        				<i class="icon icon-sort-down"></i>
+		        				<i class="icon icon-reorder"></i>
 		        				<span class="row-description">Focus in on specific topics</span>
 	        				</div>
 		        			<div class="row-item">