diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 026967e796c4d12ac3e2b3efeb6a358b7feec394..54d0050f2752b8a349b58741fac0609bc6f8c651 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -58,12 +58,15 @@ function forum_help($route_name, RouteMatchInterface $route_match) {
         '#type' => 'link',
         '#url' => Url::fromRoute('help.page', ['name' => 'forum']),
         '#title' => t('More help'),
+        '#attributes' => array(
+          'class' => array('icon-help'),
+        ),
       );
       $container = array(
         '#theme' => 'container',
         '#children' => drupal_render($more_help_link),
         '#attributes' => array(
-          'class' => array('more-help-link'),
+          'class' => array('more-link'),
         ),
       );
       $output .= drupal_render($container);
diff --git a/core/modules/system/css/system.theme.css b/core/modules/system/css/system.theme.css
index 0f5b08fdd16539621d9ae88e75709f951929c6d3..a74bac0c9ca582bb4de91f1142d92ce1abc94bab 100644
--- a/core/modules/system/css/system.theme.css
+++ b/core/modules/system/css/system.theme.css
@@ -143,20 +143,12 @@ abbr.ajax-changed {
   text-align: left;
 }
 
-/**
- * More help link style.
- */
-.more-help-link {
-  text-align: right; /* LTR */
-}
-[dir="rtl"] .more-help-link {
-  text-align: left;
-}
-.more-help-link a {
+/* Style for the help icon. */
+.icon-help {
   background: url(../../../misc/help.png) 0 50% no-repeat; /* LTR */
   padding: 1px 0 1px 20px; /* LTR */
 }
-[dir="rtl"] .more-help-link a {
+[dir="rtl"] .icon-help {
   background-position: 100% 50%;
   padding: 1px 20px 1px 0;
 }
diff --git a/core/themes/seven/css/components/help.css b/core/themes/seven/css/components/help.css
index f075c764682ad532b3eee2043dcd04759cdf7414..1cbcbd49fe516fc905b02dd1b4c6cd2b25cacdae 100644
--- a/core/themes/seven/css/components/help.css
+++ b/core/themes/seven/css/components/help.css
@@ -1,12 +1,8 @@
 /**
- * Help.
+ * @file
+ * Seven styles for the help component.
  */
+
 .help p {
   margin: 0 0 10px;
 }
-.help div.more-help-link {
-  text-align: right; /* LTR */
-}
-[dir="rtl"] .help div.more-help-link {
-  text-align: left;
-}