diff --git a/app/ContainerDetails.react.js b/app/ContainerDetails.react.js
index 7ce48a168f..fb1515d403 100644
--- a/app/ContainerDetails.react.js
+++ b/app/ContainerDetails.react.js
@@ -183,7 +183,9 @@ var ContainerDetails = React.createClass({
           <div className="action">
             <a className="btn btn-action" onClick={this.handleClick}><span className="icon icon-window-code-3"></span> Terminal</a>
           </div>
-          <div className="action btn-group">
+        </div>
+        <div className="details-tabs">
+          <div className="tabs btn-group">
             <a className="btn btn-action only-icon active"><span className="icon icon-text-wrapping-2"></span></a>
             <a className="btn btn-action only-icon"><span className="icon icon-setting-gear"></span></a>
           </div>
diff --git a/app/styles/containers.less b/app/styles/containers.less
index 4061044fbf..6e8fa55043 100644
--- a/app/styles/containers.less
+++ b/app/styles/containers.less
@@ -232,6 +232,14 @@
         }
       }
 
+      .details-tabs {
+        .tabs {
+          float: right;
+          margin-right: 40px;
+          margin-top: -42px;
+        }
+      }
+
       .details-header {
         flex: 0 auto;
         display: flex;
diff --git a/app/styles/theme.less b/app/styles/theme.less
index 528ee6c7b8..a369f7b300 100644
--- a/app/styles/theme.less
+++ b/app/styles/theme.less
@@ -34,7 +34,7 @@
   }
 
   &:active {
-    background-color: lighten(@btn-color, 30%);
+    background-color: lighten(@btn-color, 45%);
     border-color: darken(@btn-color, 10%);
     color: darken(@btn-color, 10%);
   }
@@ -73,7 +73,7 @@
   box-shadow: none;
   font-weight: 400;
   text-shadow: none;
-  padding: 0px 12px 0px 12px;
+  padding: 0px 14px 0px 14px;
   height: 32px;
   .icon:before {
     position: relative;