diff --git a/src/browser/settings.jsx b/src/browser/settings.jsx
index 059b6c45..ba28ebc3 100644
--- a/src/browser/settings.jsx
+++ b/src/browser/settings.jsx
@@ -127,11 +127,6 @@ var SettingsPage = React.createClass({
     });
   },
   render: function() {
-
-    var buttonStyle = {
-      marginTop: 20
-    };
-
     var teams_row = (
     <Row>
       <Col md={ 12 }>
@@ -170,55 +165,58 @@ var SettingsPage = React.createClass({
       </Row>
       ) : null;
 
-    var notificationSettings = [
-      {
-        label: 'Never',
-        state: 0
-      },
-      /* ToDo: Idle isn't implemented yet
-      {
-        label: 'Only when idle (after 10 seconds)',
-        state: 1
-      },*/
-      {
-        label: 'Always',
-        state: 2
-      }
-    ];
+    var notifications_row = null;
+    if (process.platform === 'win32') {
+      var notificationSettings = [
+        {
+          label: 'Never',
+          state: 0
+        },
+        /* ToDo: Idle isn't implemented yet
+        {
+          label: 'Only when idle (after 10 seconds)',
+          state: 1
+        },*/
+        {
+          label: 'Always',
+          state: 2
+        }
+      ];
 
-    var that = this;
-    var notificationElements = notificationSettings.map(function(item) {
-      var boundClick = that.handleFlashWindowSetting.bind(that, item);
-      return (
-        <Input key={ "flashWindow" + item.state } name="handleFlashWindow" ref={ "flashWindow" + item.state } type="radio" label={ item.label } value={ item.state } onChange={ boundClick }
-          checked={ that.state.notifications.flashWindow == item.state ? "checked" : "" } />
-        );
-    });
+      var that = this;
+      var notificationElements = notificationSettings.map(function(item) {
+        var boundClick = that.handleFlashWindowSetting.bind(that, item);
+        return (
+          <Input key={ "flashWindow" + item.state } name="handleFlashWindow" ref={ "flashWindow" + item.state } type="radio" label={ item.label } value={ item.state } onChange={ boundClick }
+            checked={ that.state.notifications.flashWindow == item.state ? "checked" : "" } />
+          );
+      });
 
-    var notifications = (
-    <Row>
-      <Col md={ 12 }>
-      <h2>Notifications</h2> Configure, that the taskicon in the taskbar blinks when you were mentioned.
-      { notificationElements }
-      </Col>
-    </Row>
-    )
+      notifications_row = (
+        <Row>
+          <Col md={ 12 }>
+          <h3>Notifications</h3> Configure, that the taskicon in the taskbar blinks when new message arrives.
+          { notificationElements }
+          </Col>
+        </Row>
+      );
+    }
 
     return (
       <Grid className="settingsPage">
         <Row>
-          <Col xs={ 4 } sm={ 1 } md={ 2 } lg={ 2 }>
+          <Col xs={ 4 } sm={ 2 } md={ 2 } lg={ 1 }>
           <h2>Teams</h2>
           </Col>
-          <Col xs={ 4 } sm={ 2 } md={ 1 } lg={ 1 } mdPull={ 1 }>
-          <Button className="pull-right" style={ buttonStyle } bsSize="small" onClick={ this.toggleShowTeamForm }>
+          <Col xs={ 8 } sm={ 10 } md={ 10 } lg={ 11 }>
+          <Button bsSize="small" style={ { marginTop: 20 } } onClick={ this.toggleShowTeamForm }>
             <Glyphicon glyph="plus" />
           </Button>
           </Col>
         </Row>
         { teams_row }
         { options_row }
-        { notifications }
+        { notifications_row }
         <div>
           <hr />
         </div>