diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index e843c2d..f55a365 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -379,6 +379,10 @@ function editor_pre_render_format($element) {
     $element['format']['format']['#attributes']['data-editor-for'] = $field_id;
   }
 
+  // Hide the text format's filters' guidelines: they're rather useless when
+  // using a text editor.
+  unset($element['format']['guidelines']);
+
   // Attach Text Editor module's (this module) library.
   $element['#attached']['library'][] = array('editor', 'drupal.editor');
 
diff --git a/core/modules/filter/css/filter.admin.css b/core/modules/filter/css/filter.admin.css
index 80ad171..a828adf 100644
--- a/core/modules/filter/css/filter.admin.css
+++ b/core/modules/filter/css/filter.admin.css
@@ -8,17 +8,18 @@
  * Filter information under field.
  */
 .text-format-wrapper > .form-item {
-  margin-bottom: 0;
+  margin: 0;
 }
 
 .filter-wrapper {
   border: 1px solid #ccc;
   border-top: 0;
   margin: 0;
-  padding: 0.5em 1.5em;
+  padding: 1px 8px 0 8px;
 }
+
 .filter-wrapper .form-item {
-  margin-top: 0;
+  margin: 0.65em 0 0.65em 0;
 }
 .filter-wrapper .form-item label {
   display: inline;
@@ -26,6 +27,7 @@
 
 .filter-help {
   float: right; /* LTR */
+  margin: 0.65em 0 0.65em 0;
 }
 [dir="rtl"] .filter-help {
   float: left;
diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module
index ea98965..cf1bac2 100644
--- a/core/modules/filter/filter.module
+++ b/core/modules/filter/filter.module
@@ -778,7 +778,7 @@ function filter_process_format($element) {
   $element['format']['help'] = array(
     '#type' => 'container',
     '#attributes' => array('class' => array('filter-help')),
-    '#markup' => l(t('More information about text formats'), 'filter/tips', array('attributes' => array('target' => '_blank'))),
+    '#markup' => l(t('About text formats'), 'filter/tips', array('attributes' => array('target' => '_blank'))),
     '#weight' => 0,
   );