diff --git a/images/button-restart.png b/images/button-restart.png
index 0cf9ae43ce..0973ab12b9 100644
Binary files a/images/button-restart.png and b/images/button-restart.png differ
diff --git a/images/button-restart@2x.png b/images/button-restart@2x.png
index bb62729cb3..2a354f6eb0 100644
Binary files a/images/button-restart@2x.png and b/images/button-restart@2x.png differ
diff --git a/images/button-start.png b/images/button-start.png
index 29f6a9660a..97baafe4f2 100644
Binary files a/images/button-start.png and b/images/button-start.png differ
diff --git a/images/button-start@2x.png b/images/button-start@2x.png
index 3501025c99..12fd77e8f4 100644
Binary files a/images/button-start@2x.png and b/images/button-start@2x.png differ
diff --git a/images/button-stop.png b/images/button-stop.png
index 462fcd0f1d..65393c2912 100644
Binary files a/images/button-stop.png and b/images/button-stop.png differ
diff --git a/images/button-stop@2x.png b/images/button-stop@2x.png
index 4ea22127f1..6dde93e4f0 100644
Binary files a/images/button-stop@2x.png and b/images/button-stop@2x.png differ
diff --git a/images/button-terminal.png b/images/button-terminal.png
index cfcedd974f..18d6c982d0 100644
Binary files a/images/button-terminal.png and b/images/button-terminal.png differ
diff --git a/images/button-terminal@2x.png b/images/button-terminal@2x.png
index 658786d3f6..877c521f09 100644
Binary files a/images/button-terminal@2x.png and b/images/button-terminal@2x.png differ
diff --git a/images/button-view.png b/images/button-view.png
index 0eb0c2e5bd..d338992a50 100644
Binary files a/images/button-view.png and b/images/button-view.png differ
diff --git a/images/button-view@2x.png b/images/button-view@2x.png
index 9a9e206961..c1b377c927 100644
Binary files a/images/button-view@2x.png and b/images/button-view@2x.png differ
diff --git a/src/components/ContainerDetailsSubheader.react.js b/src/components/ContainerDetailsSubheader.react.js
index f5ee477cc7..bc9d4a348d 100644
--- a/src/components/ContainerDetailsSubheader.react.js
+++ b/src/components/ContainerDetailsSubheader.react.js
@@ -107,7 +107,8 @@ var ContainerDetailsSubheader = React.createClass({
         shell = 'sh';
       }
       machine.ip().then(ip => {
-        var cmd = [resources.terminal(), 'ssh', '-p', '22', '-o', 'UserKnownHostsFile=/dev/null', '-o', 'LogLevel=quiet', '-o', 'StrictHostKeyChecking=no', '-i', '~/.docker/machine/machines/' + machine.name() + '/id_rsa', 'docker@' + ip, '-t', 'docker', 'exec', '-i', '-t', container.Name, shell];
+        var cmd = [resources.terminal(), 'ssh', '-p', '22', '-o', 'UserKnownHostsFile=/dev/null', '-o', 'LogLevel=quiet', '-o', 'StrictHostKeyChecking=no', '-i', '~/.docker/machine/machines/' + machine.name() + '/id_rsa', 'docker@' + ip, '-t', 'docker', 
+          'exec', '-i', '-t', container.Name, shell];
         exec(cmd, function (stderr, stdout, code) {
           if (code) {
             console.log(stderr);
@@ -215,19 +216,19 @@ var ContainerDetailsSubheader = React.createClass({
     return (
       <div className="details-subheader">
         <div className="details-header-actions">
-          <div className={runActionClass} onMouseEnter={this.handleItemMouseEnterView} onMouseLeave={this.handleItemMouseLeaveView}>
-            <div className="action-icon" onClick={this.handleRun}><RetinaImage src="button-view.png"/></div>
-            <span className="btn-label view">View</span>
-          </div>
+          {startStopToggle}
           <div className={restartActionClass} onMouseEnter={this.handleItemMouseEnterRestart} onMouseLeave={this.handleItemMouseLeaveRestart}>
             <div className="action-icon" onClick={this.handleRestart}><RetinaImage src="button-restart.png"/></div>
             <span className="btn-label restart">Restart</span>
           </div>
-          {startStopToggle}
           <div className={terminalActionClass} onMouseEnter={this.handleItemMouseEnterTerminal} onMouseLeave={this.handleItemMouseLeaveTerminal}>
             <div className="action-icon" onClick={this.handleTerminal}><RetinaImage src="button-terminal.png"/></div>
             <span className="btn-label terminal">Terminal</span>
           </div>
+          <div className={runActionClass} onMouseEnter={this.handleItemMouseEnterView} onMouseLeave={this.handleItemMouseLeaveView}>
+            <div className="action-icon" onClick={this.handleRun}><RetinaImage src="button-view.png"/></div>
+            <span className="btn-label view">View</span>
+          </div>
         </div>
         <div className="details-subheader-tabs">
           <span className={tabHomeClasses} onClick={this.showHome}>Home</span>
diff --git a/styles/container-settings.less b/styles/container-settings.less
index 135105535b..be22086853 100644
--- a/styles/container-settings.less
+++ b/styles/container-settings.less
@@ -32,7 +32,7 @@
           li {
             cursor: default;
             border-radius: 40px;
-            background-color: @color-background;
+            background-color: @gray-lightest;
           }
         }
         &:focus {
diff --git a/styles/right-panel.less b/styles/right-panel.less
index 3ceb91d29f..d67a9f9974 100644
--- a/styles/right-panel.less
+++ b/styles/right-panel.less
@@ -13,7 +13,7 @@
     position: relative;
     border-bottom: 1px solid @color-divider;
     background-color: white;
-    height: 57px;
+    height: 51px;
     padding: 6px 10px 10px 24px;
     font-size: 13px;
     color: @gray-normal;
@@ -25,11 +25,21 @@
         display: inline-block;
         position: relative;
         img {
-          width: 42px;
-          height: 42px;
+          width: 35px;
+          height: 35px;
         }
         &.disabled {
           opacity: 0.3;
+          &:active {
+            img, .btn-label {
+              -webkit-filter: brightness(1);
+            }
+          }
+        }
+        &:active {
+          img, .btn-label {
+            -webkit-filter: brightness(0.8);
+          }
         }
         .action-icon {
           color: @gray-normal;
@@ -40,21 +50,21 @@
           color: @brand-action;
           font-size: 9px;
           width: 200px;
-          top: 45px;
+          top: 38px;
           &.view {
-            left: 7px;
+            left: 8px;
           }
           &.restart {
-            left: 2px;
+            left: 3px;
           }
           &.stop {
-            left: 7px;
+            left: 8px;
           }
           &.start {
-            left: 7px;
+            left: 8px;
           }
           &.terminal {
-            left: -1px;
+            left: 1px;
           }
           visibility: hidden;
         }