diff --git a/core/modules/ckeditor/css/ckeditor.admin.css b/core/modules/ckeditor/css/ckeditor.admin.css
index ee29461..2073d1d 100644
--- a/core/modules/ckeditor/css/ckeditor.admin.css
+++ b/core/modules/ckeditor/css/ckeditor.admin.css
@@ -102,6 +102,7 @@
   float: right;
 }
 .ckeditor-groupnames-toggle {
+  cursor: pointer;
   float: right; /* LTR */
 }
 [dir="rtl"] .ckeditor-groupnames-toggle {
@@ -134,7 +135,8 @@
   width: 20%;
 }
 .ckeditor-toolbar-disabled .ckeditor-buttons li a,
-.ckeditor-toolbar .ckeditor-buttons {
+.ckeditor-toolbar .ckeditor-buttons,
+.ckeditor-add-new-group button {
   border: 1px solid #a6a6a6;
   border-bottom-color: #979797;
   border-radius: 3px;
@@ -159,13 +161,16 @@
 [dir="rtl"] .ckeditor-buttons li {
   float: right;
 }
-.ckeditor-buttons li a {
+.ckeditor-buttons li a,
+.ckeditor-add-new-group button {
   background: #e4e4e4;
   background-image: -moz-linear-gradient(top, white, #e4e4e4);
   background-image: -webkit-linear-gradient(top, white, #e4e4e4);
   background-image: linear-gradient(top, white, #e4e4e4);
-  border: 0;
   color: #474747;
+}
+.ckeditor-buttons li a {
+  border: 0;
   cursor: move;
   display: block;
   height: 18px;
diff --git a/core/modules/ckeditor/js/ckeditor.admin.js b/core/modules/ckeditor/js/ckeditor.admin.js
index c0ee5ec..7d41680 100644
--- a/core/modules/ckeditor/js/ckeditor.admin.js
+++ b/core/modules/ckeditor/js/ckeditor.admin.js
@@ -1522,7 +1522,7 @@ Drupal.theme.ckeditorButtonGroupNameForm = function () {
  * @return String
  */
 Drupal.theme.ckeditorButtonGroupNamesToggle = function () {
-  return '<button class="ckeditor-groupnames-toggle" role="button" aria-pressed="false"></button>';
+  return '<a class="ckeditor-groupnames-toggle" role="button" aria-pressed="false"></a>';
 };
 
 /**