diff --git a/core/modules/ckeditor/css/ckeditor-iframe.css b/core/modules/ckeditor/css/ckeditor-iframe.css
index 38ada3a0fa6b5554a19bbd7089a06a7177a40b5a..8996334da9a06377e117a79763b2eb7d98827121 100644
--- a/core/modules/ckeditor/css/ckeditor-iframe.css
+++ b/core/modules/ckeditor/css/ckeditor-iframe.css
@@ -17,8 +17,6 @@ body {
 }
 
 ol, ul, dl {
-  /* IE7: reset rtl list margin. (CKEditor issue #7334) */
-  *margin-right: 0px;
   /* Preserved spaces for list items with text direction other than the list.
    * (CKEditor issues #6249,#8049) */
   padding: 0 40px;
diff --git a/core/modules/ckeditor/css/ckeditor.admin.css b/core/modules/ckeditor/css/ckeditor.admin.css
index 18ba2f9259920257dff606c8cadfe8e7a155a024..f8e9727f7cf052335eed31cb1f7fc725bbb47fa4 100644
--- a/core/modules/ckeditor/css/ckeditor.admin.css
+++ b/core/modules/ckeditor/css/ckeditor.admin.css
@@ -35,7 +35,7 @@
   padding: 0;
 }
 .ckeditor-row {
-  padding: 2px 0px 3px;
+  padding: 2px 0 3px;
   border-radius: 3px;
 }
 .ckeditor-group-names-are-visible .ckeditor-row {
@@ -47,13 +47,11 @@
 .ckeditor-toolbar-group,
 .ckeditor-toolbar-group-placeholder,
 .ckeditor-add-new-group {
-  display: inline-block;
   float: left; /* LTR */
 }
 [dir="rtl"] .ckeditor-toolbar-group,
 [dir="rtl"] .ckeditor-toolbar-group-placeholder,
 [dir="rtl"] .ckeditor-add-new-group {
-  display: inline-block;
   float: right;
 }
 .ckeditor-toolbar-groups {
@@ -115,7 +113,7 @@
   margin: 3px 6px;
   padding: 3px;
 }
-#ckeditor-button-description {
+.ckeditor-toolbar-configuration .fieldset-description{
   margin-bottom: 1em;
 }
 .ckeditor-toolbar-disabled .ckeditor-toolbar-available,
@@ -149,7 +147,6 @@
   min-width: 26px;
 }
 .ckeditor-buttons li {
-  display: inline-block;
   padding: 0;
   margin: 0;
   float: left; /* LTR */
@@ -168,7 +165,8 @@
   border: 0;
   cursor: move;
   display: block;
-  height: 18px;
+  min-height: 18px;
+  line-height: 1.4;
   padding: 4px 6px;
   position: relative;
   text-decoration: none;
@@ -184,6 +182,7 @@
 .ckeditor-buttons li .cke-icon-only {
   text-indent: -9999px;
   width: 16px;
+  direction: ltr;
   /* Firefox includes the offscreen text in the focus indicator, resulting in a
      far too wide focus indicator. This fixes that. */
   overflow: hidden;
@@ -226,7 +225,6 @@
   float: right;
 }
 .ckeditor-multiple-buttons li {
-  display: inline-block;
   float: left; /* LTR */
   margin: 0;
   padding: 0;
@@ -237,7 +235,8 @@
 .ckeditor-multiple-buttons li a {
   cursor: move;
   display: inline-block;
-  height: 18px;
+  min-height: 18px;
+  line-height: 1.4;
   margin: 0;
   padding: 2px 0;
 }
@@ -301,9 +300,10 @@ ul.ckeditor-buttons li.ckeditor-button-separator a {
 }
 .ckeditor-row-controls a {
   display: inline-block;
+  box-sizing: border-box;
   padding: 6px 2px;
-  height: 16px;
-  width: 16px;
+  height: 28px;
+  width: 20px;
   line-height: 0.9;
   font-weight: bold;
   color: #333;