diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss
index de37b0ac89..0044aee445 100644
--- a/lms/static/sass/_discussion.scss
+++ b/lms/static/sass/_discussion.scss
@@ -733,21 +733,13 @@ body.discussion {
         position: absolute;
         top: 30%;
         left: 30%;
-<<<<<<< HEAD
         color: $gray-l1;
-=======
->>>>>>> cleaned up font-awesome integration to work with new mako file .scss compiling, added in initial icon references
         font-size: 28px;
         z-index: 100;
-<<<<<<< HEAD
-        opacity: 1;
-        @include transition(all .2s ease-out);
-=======
         width: 25px;
         height: 25px;
         opacity: 1;
         @include transition(none);
->>>>>>> basic shell for discussion home page with both profile information and email notification settings
       }
     }
 
@@ -922,11 +914,7 @@ body.discussion {
           float: left;
           width: 80%;
           margin: 13px 0;
-<<<<<<< HEAD
           color: $white;
-=======
-          color: #fff;
->>>>>>> basic shell for discussion home page with both profile information and email notification settings
         }
 
         .unread {
@@ -1513,27 +1501,61 @@ body.discussion {
       .row-title {
         padding: $baseline;
         display: inline-block;
-        width: 20%;
+        width: 15%;
         background-color: $light-gray;
+        font-size: 12px;
       }
 
-      .row-item {
+      .row-item-full, .row-item {
         display: inline-block;
         font-size: 12px;
-        width: 20%;
+        width: 25%;
         vertical-align: middle;
 
-        i.icon {
+        .icon {
           padding: 0 $baseline/2;
           font-size: 24px;
           display: inline-block;
+          vertical-align: middle;
         }
 
+        .row-description {
+          display: inline-block;
+          width: 70%;
+          vertical-align: middle;
+        }
+      }
+
+      .row-item-full {
+        width: 70%;
+
+        .row-description {
+          width: 90%;
+        }
       }
     }
   }
 
+<<<<<<< HEAD
 >>>>>>> basic shell for discussion home page with both profile information and email notification settings
+=======
+  .helpgrid-row-navigation {
+    .icon-sort-down {color: $light-gray;}
+    .icon-search {color: $light-gray;}
+    .icon-sort {color: $light-gray;}
+  }
+
+  .helpgrid-row-participation {
+    .icon-plus {color: $green-u2;}
+    .icon-flag {color: $red-u2;}
+    .icon-star {color: $blue;}
+  }
+
+  .helpgrid-row-notification {
+    .icon-sign-blank {color: $green;}
+  }
+
+>>>>>>> cleaned up variables styling to sync up closer to studio, incorporated fontawesome icons into discusison home with basic positioning
   .discussion-article {
     position: relative;
     padding: $baseline*2;
diff --git a/lms/templates/discussion/index.html b/lms/templates/discussion/index.html
index 4cca6f95dd..58ac430b4b 100644
--- a/lms/templates/discussion/index.html
+++ b/lms/templates/discussion/index.html
@@ -92,7 +92,6 @@
 								<span class="row-setting"><input type="checkbox" name="email-notification"></input></span>
 								<span class="row-description"> If enabled, you will receive an email digest once a day notifying you about new, unread activity from posts you are following. </span>
 							</div>
-
 		        		</li>
 		        	</ul>
 	        	</section>