diff --git a/core/modules/contextual/css/contextual.icons.css b/core/modules/contextual/css/contextual.icons.css
index 668e510..70363a7 100644
--- a/core/modules/contextual/css/contextual.icons.css
+++ b/core/modules/contextual/css/contextual.icons.css
@@ -23,13 +23,17 @@
   background-repeat: no-repeat;
   background-size: 16px 16px;
   /* Override the .focusable height: auto */
-  height: 28px !important;
+  height: 26px !important;
   /* Override the .focusable height: auto */
-  width: 28px !important;
+  width: 26px !important;
   text-indent: -9999px;
 }
 
-.contextual .trigger:focus,
 .contextual .trigger:hover {
   background-image: url(../../../misc/icons/787878/pencil.svg);
 }
+
+.contextual .trigger:focus {
+  background-image: url(../../../misc/icons/5181c6/pencil.svg);
+  outline: none;
+}
diff --git a/core/modules/contextual/css/contextual.theme.css b/core/modules/contextual/css/contextual.theme.css
index 53dc48a..92e9b74 100644
--- a/core/modules/contextual/css/contextual.theme.css
+++ b/core/modules/contextual/css/contextual.theme.css
@@ -9,7 +9,7 @@
 .contextual {
   position: absolute;
   right: 0; /* LTR */
-  top: 2px;
+  top: 6px;
   z-index: 500;
 }
 [dir="rtl"] .contextual {
@@ -31,9 +31,8 @@
 .contextual .trigger {
   background-attachment: scroll;
   background-color: #fff;
-  border: none;
-  border-radius: 14px;
-  box-shadow: 1px 1px 2px rgba(0,0,0,0.3);
+  border: 1px solid #ccc;
+  border-radius: 13px;
   float: right; /* LTR */
   margin: 0;
   overflow: hidden;
@@ -48,9 +47,9 @@
   left: 6px;
 }
 .contextual.open .trigger {
-  border: 1px solid #ddd;
+  border: 1px solid #ccc;
   border-bottom-color: transparent;
-  border-radius: 14px 14px 0 0;
+  border-radius: 13px 13px 0 0;
   box-shadow: none;
   z-index: 2;
 }
@@ -62,7 +61,7 @@
  */
 .contextual-region .contextual .contextual-links {
   background-color: #fff;
-  border: 1px solid #ddd;
+  border: 1px solid #ccc;
   border-radius: 4px 0 4px 4px; /* LTR */
   clear: both;
   float: right; /* LTR */