From 7dd7b3f32c112b733ee6297164e43b47bbd1a845 Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Mon, 20 Jul 2015 18:12:30 +0930
Subject: [PATCH] Separate icon from notification grid labels

---
 js/forum/src/components/NotificationGrid.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/forum/src/components/NotificationGrid.js b/js/forum/src/components/NotificationGrid.js
index d1492e921..754674d3a 100644
--- a/js/forum/src/components/NotificationGrid.js
+++ b/js/forum/src/components/NotificationGrid.js
@@ -74,7 +74,7 @@ export default class NotificationGrid extends Component {
           {this.types.map(type => (
             <tr>
               <td className="NotificationGrid-groupToggle" onclick={this.toggleType.bind(this, type.name)}>
-                {type.label}
+                {icon(type.icon)} {type.label}
               </td>
               {this.methods.map(method => (
                 <td className="NotificationGrid-checkbox">
@@ -181,7 +181,8 @@ export default class NotificationGrid extends Component {
 
     items.add('discussionRenamed', {
       name: 'discussionRenamed',
-      label: [icon('pencil'), ' ', app.trans('core.notify_discussion_renamed')]
+      icon: 'pencil',
+      label: app.trans('core.notify_discussion_renamed')
     });
 
     return items;