diff --git a/core/modules/ckeditor/css/ckeditor.admin.css b/core/modules/ckeditor/css/ckeditor.admin.css
index 55a7d8c4c9..5c901ca39a 100644
--- a/core/modules/ckeditor/css/ckeditor.admin.css
+++ b/core/modules/ckeditor/css/ckeditor.admin.css
@@ -87,7 +87,8 @@
   margin: 0 3px;
   cursor: move;
 }
-.ckeditor-group-names-are-visible .ckeditor-toolbar-group {
+.ckeditor-group-names-are-visible .ckeditor-toolbar-group,
+.ckeditor-add-new-group {
   border: 1px dotted #a6a6a6;
   background: #fff;
   padding: 6px;
@@ -128,6 +129,19 @@
   display: block;
   height: 3.25em;
 }
+.ckeditor-toolbar-group-buttons {
+  float: left; /* LTR */
+}
+[dir="rtl"] .ckeditor-toolbar-group-buttons {
+  float: right;
+}
+.ckeditor-groupnames-toggle {
+  cursor: pointer;
+  float: right; /* LTR */
+}
+[dir="rtl"] .ckeditor-groupnames-toggle {
+  float: left;
+}
 .ckeditor-toolbar .ckeditor-toolbar-group > li {
   border: 1px solid #d1d1d1;
   margin: 0 6px;
@@ -139,8 +153,9 @@
 
 /* Buttons */
 .ckeditor-buttons {
-  /*height: 18px;*/
   outline: 0;
+  min-height: 26px;
+  min-width: 26px;
 }
 .ckeditor-buttons li {
   position: relative;
diff --git a/core/themes/stable/css/ckeditor/ckeditor.admin.css b/core/themes/stable/css/ckeditor/ckeditor.admin.css
index 55a7d8c4c9..5c901ca39a 100644
--- a/core/themes/stable/css/ckeditor/ckeditor.admin.css
+++ b/core/themes/stable/css/ckeditor/ckeditor.admin.css
@@ -87,7 +87,8 @@
   margin: 0 3px;
   cursor: move;
 }
-.ckeditor-group-names-are-visible .ckeditor-toolbar-group {
+.ckeditor-group-names-are-visible .ckeditor-toolbar-group,
+.ckeditor-add-new-group {
   border: 1px dotted #a6a6a6;
   background: #fff;
   padding: 6px;
@@ -128,6 +129,19 @@
   display: block;
   height: 3.25em;
 }
+.ckeditor-toolbar-group-buttons {
+  float: left; /* LTR */
+}
+[dir="rtl"] .ckeditor-toolbar-group-buttons {
+  float: right;
+}
+.ckeditor-groupnames-toggle {
+  cursor: pointer;
+  float: right; /* LTR */
+}
+[dir="rtl"] .ckeditor-groupnames-toggle {
+  float: left;
+}
 .ckeditor-toolbar .ckeditor-toolbar-group > li {
   border: 1px solid #d1d1d1;
   margin: 0 6px;
@@ -139,8 +153,9 @@
 
 /* Buttons */
 .ckeditor-buttons {
-  /*height: 18px;*/
   outline: 0;
+  min-height: 26px;
+  min-width: 26px;
 }
 .ckeditor-buttons li {
   position: relative;