diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index aba30babfe..d48d819b64 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -732,10 +732,10 @@ body.discussion {
         position: absolute;
         top: 30%;
         left: 30%;
+        font-size: 28px;
         z-index: 100;
         width: 25px;
         height: 25px;
-        //margin-left: -17px;
         opacity: 1;
         @include transition(none);
       }
@@ -1289,6 +1289,7 @@ body.discussion {
 
     section {
       border-bottom: 1px solid #ccc;
+      margin: $baseline $baseline $baseline 0;
     }
 
     .label {
@@ -1297,7 +1298,7 @@ body.discussion {
     }
 
     .home-header {
-      //nothing here
+      margin: 0;
     }
 
     .home-title {
@@ -1313,7 +1314,6 @@ body.discussion {
     .home-stats {
       
       .label-area {
-        padding: $baseline;
         display: inline-block;
         min-width: $baseline*5;
         width: 25%;
@@ -1372,6 +1372,13 @@ body.discussion {
         font-size: 12px;
         width: 20%;
         vertical-align: middle;
+
+        i.icon {
+          padding: 0 $baseline/2;
+          font-size: 24px;
+          display: inline-block;
+        }
+
       }
     }
   }
diff --git a/lms/static/sass/application.scss.mako b/lms/static/sass/application.scss.mako
index c310347b6f..db100afa2f 100644
--- a/lms/static/sass/application.scss.mako
+++ b/lms/static/sass/application.scss.mako
@@ -1,14 +1,33 @@
-@import 'bourbon/bourbon';
+// lms - css application architecture
+// ====================
+
+// libs and resets *do not edit*
+@import 'bourbon/bourbon'; // lib - bourbon
+
+// VENDOR + REBASE *referenced/used vendor presentation and reset*
+// ====================
 
 @import 'base/reset';
-@import 'base/font_face';
+@import 'vendor/font-awesome';
+
+
+// BASE  *default edX offerings*
+// ====================
+// base - utilities
+
 @import 'base/mixins';
 @import 'base/variables';
 @import 'base/base';
-@import 'base/extends';
-@import 'base/animations';
 
-// Multicourse styles
+// base - assets
+@import 'base/font_face';
+@import 'base/extends';
+@import 'base/animations'; 	
+
+// base - starter
+@import 'base/base';
+
+// shared - course 
 @import 'shared/forms';
 @import 'shared/footer';
 @import 'shared/header';
@@ -17,6 +36,7 @@
 @import 'shared/modal';
 @import 'shared/activation_messages';
 
+// shared - platform
 @import 'multicourse/home';
 @import 'multicourse/dashboard';
 @import 'multicourse/account';
@@ -32,10 +52,11 @@
 @import 'multicourse/help';
 @import 'multicourse/edge';
 
+// applications 
 @import 'discussion';
 @import 'news';
 
-@import 'shame';
+@import 'shame'; // shame file - used for any bad-form/orphaned scss that knowingly violate edX FED architecture/standards (see - http://csswizardry.com/2013/04/shame-css/)
 
 ## THEMING
 ## -------
diff --git a/lms/templates/discussion/_filter_dropdown.html b/lms/templates/discussion/_filter_dropdown.html
index a191e1b583..2781243db7 100644
--- a/lms/templates/discussion/_filter_dropdown.html
+++ b/lms/templates/discussion/_filter_dropdown.html
@@ -36,7 +36,7 @@
         %if flag_moderator:
         <li>
             <a href="#">
-                <span class="board-name" data-discussion_id='#flagged'>Show Flagged Discussions</span>
+                <span class="board-name" data-discussion_id='#flagged'><i class="icon-flag" style="padding-right:5px;"></i>Show Flagged Discussions</span>
             </a>
         </li>
         
diff --git a/lms/templates/discussion/index.html b/lms/templates/discussion/index.html
index a9ba66d71f..cb4583c365 100644
--- a/lms/templates/discussion/index.html
+++ b/lms/templates/discussion/index.html
@@ -38,7 +38,7 @@
 	        		<div class="stats-grouping">
 		        		<div class="profile-stat profile-stat-posts"><span class="count count-posts">5</span>POSTS</div>
 		        		<div class="profile-stat profile-stat-comments"><span class="count count-comments">12</span> COMMENTS</div>
-		        		<div class="profile-stat profile-stat-following"><span class="count count-following">9</span> POSTS I'M FOLLOWING</div>
+		        		<div class="profile-stat profile-stat-following"><span class="count count-following">9</span> POSTS I FOLLOW</div>
 		        	</div>
 	        	</section>
 	        	<span class="label">HOW TO USE EDX DISCUSSIONS</span>
@@ -47,16 +47,16 @@
 		        		<li class="helpgrid-row helpgrid-row-navigation">
 		        			<span class="row-title">Navigation</span>
 		        			<div class="row-item">
-		        				<i class="icon-home"></i>Focus in on specific topics
+		        				<i class="icon icon-sort-down"></i>Focus in on specific topics
 	        				</div>
-		        			<div class="row-item">Search for specific posts</div>
-		        			<div class="row-item">Sort by date, vote, or comments</div>
+		        			<div class="row-item"><i class="icon icon-search"></i>Search for specific posts</div>
+		        			<div class="row-item"><i class="icon icon-sort"></i>Sort by date, vote, or comments</div>
 		        		</li>
 		        		<li class="helpgrid-row helpgrid-row-participation">
 		        			<span class="row-title">Participation</span>
-		        			<div class="row-item">Upvote posts and good responses</div>
-		        			<div class="row-item">Report Forum Misuse</div>
-		        			<div class="row-item">Follow posts for updates</div>
+		        			<div class="row-item"><i class="icon icon-plus"></i>Upvote posts and good responses</div>
+		        			<div class="row-item"><i class="icon icon-flag"></i>Report Forum Misuse</div>
+		        			<div class="row-item"><i class="icon icon-star"></i>Follow posts for updates</div>
 		        		</li>
 		        		<li class="helpgrid-row helpgrid-row-notification">
 		        			<span class="row-title">Notification</span>