diff --git a/app/Header.react.js b/app/Header.react.js
index 83fffe8ad9..760dce09d9 100644
--- a/app/Header.react.js
+++ b/app/Header.react.js
@@ -8,16 +8,28 @@ var Header = React.createClass({
   handleMinimize: function () {
     remote.getCurrentWindow().minimize();
   },
-  handleMaximize: function () {
-    remote.getCurrentWindow().setFullScreen(!remote.getCurrentWindow().isFullScreen());
+  handleFullscreen: function () {
+    var isFullscreen = remote.getCurrentWindow().isFullScreen();
+    remote.getCurrentWindow().setFullScreen(!isFullscreen);
+    this.forceUpdate();
+  },
+  handleFullscreenHover: function () {
+    this.update();
   },
   render: function () {
+    var fullscreenButton;
+    if (remote.getCurrentWindow().isFullScreen()) {
+      fullscreenButton = <div className="button button-fullscreenclose" onClick={this.handleFullscreen}></div>;
+    } else {
+      fullscreenButton = <div className="button button-fullscreen" onClick={this.handleFullscreen}></div>;
+    }
+
     return (
       <div className="header">
         <div className="buttons">
           <div className="button button-close" onClick={this.handleClose}></div>
           <div className="button button-minimize" onClick={this.handleMinimize}></div>
-          <div className="button button-maximize" onClick={this.handleMaximize}></div>
+          {fullscreenButton}
         </div>
       </div>
     );
diff --git a/app/images/fullscreen.png b/app/images/fullscreen.png
new file mode 100644
index 0000000000..284cb69a72
Binary files /dev/null and b/app/images/fullscreen.png differ
diff --git a/app/images/maximize@2x.png b/app/images/fullscreen@2x.png
similarity index 100%
rename from app/images/maximize@2x.png
rename to app/images/fullscreen@2x.png
diff --git a/app/images/fullscreenclose.png b/app/images/fullscreenclose.png
new file mode 100644
index 0000000000..d3d6543be4
Binary files /dev/null and b/app/images/fullscreenclose.png differ
diff --git a/app/images/maximize.png b/app/images/maximize.png
deleted file mode 100644
index d0db77582e..0000000000
Binary files a/app/images/maximize.png and /dev/null differ
diff --git a/app/styles/main.less b/app/styles/main.less
index 3d0d99884a..d8dd939fe3 100644
--- a/app/styles/main.less
+++ b/app/styles/main.less
@@ -23,8 +23,11 @@
       .button-close {
         .at2x('close.png', 10px, 10px);
       }
-      .button-maximize {
-        .at2x('maximize.png', 10px, 10px);
+      .button-fullscreen {
+        .at2x('fullscreen.png', 10px, 10px);
+      }
+      .button-fullscreenclose {
+        .at2x('fullscreenclose.png', 10px, 10px);
       }
     }
 
@@ -44,7 +47,8 @@
         box-shadow: 0px 1px 1px 0px rgba(195,198,201,0.50);
       }
 
-      &:active {
+      &:hover:active {
+        cursor: default;
         -webkit-filter: brightness(92%);
       }
     }
@@ -157,6 +161,7 @@
       }
 
       .logs {
+        user-select: text;
         overflow: auto;
         font-family: Menlo;
         font-size: 12px;
@@ -174,6 +179,7 @@ html, body {
   width: 100%;
   overflow: hidden;
 
+  user-select: none;
   -webkit-font-smoothing: subpixel-antialiased;
   font-family: 'Helvetica Neue', sans-serif;
 }