diff --git a/core/modules/contextual/contextual.theme.css b/core/modules/contextual/contextual.theme.css
index d86c596..e08393f 100644
--- a/core/modules/contextual/contextual.theme.css
+++ b/core/modules/contextual/contextual.theme.css
@@ -20,14 +20,19 @@
  */
 .contextual .trigger {
   background: transparent url(images/gear-select.png) no-repeat 2px 0;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
   border: 1px solid transparent;
-  height: 18px;
+  border-bottom: none;
+  height: 19px;
   margin: 0;
-  outline: none;
   overflow: hidden;
-  padding: 0 2px;
+  padding: 0;
   text-indent: 34px;
-  width: 28px;
+  width: 34px;
+}
+.contextual-active .trigger:focus {
+  outline: none;
 }
 .contextual .trigger:hover,
 .contextual-active .trigger {
@@ -35,7 +40,6 @@
 }
 .contextual-active .trigger {
   background-color: #ffffff;
-  border-bottom: none;
   border-color: #d6d6d6;
   border-radius: 4px 4px 0 0;
   position: relative;