diff --git a/include/i18n/en_US/help/tips/settings.pages.yaml b/include/i18n/en_US/help/tips/settings.pages.yaml
index b019aeda1ac2c5bee4b0ca4c937b5b9ab2f9128c..a506e338509ad0a6d0970f127f4e282af5cf15c0 100644
--- a/include/i18n/en_US/help/tips/settings.pages.yaml
+++ b/include/i18n/en_US/help/tips/settings.pages.yaml
@@ -24,24 +24,18 @@ company_information:
       - title: Company Information Form
         href: /scp/forms.php?type=C
 
-site_pages:
-    title: Site Pages
-    content: >
-        To manage your customize pages, see Admin Panel -> Manage -> Pages.
-
 landing_page:
     title: Landing Page
     content: >
-        What page would you like your clients to see when they first “land” on your
-        support site (i.e., your installation of osTicket)?
+        The <span class="doc-desc-title">Landing Page</span> is displayed on
+        the front page of your your support site.
 
 offline_page:
     title: Offline Page
     content: >
-        What page would you like your clients to see when the system is either
-        being updated or maintained? To activate the <span
-        class="doc-desc-title">Offline Page</span>, see Admin Panel -> Setting ->
-        System -> Helpdesk Status.
+        The <span class="doc-desc-title">Offline Page</span> is displayed in
+        the support site when the help desk is offline, see Admin Panel
+        -&gt; Setting -&gt; System -&gt; Helpdesk Status.
 
 default_thank_you_page:
     title: Default Thank-You Page
@@ -49,6 +43,9 @@ default_thank_you_page:
         The <span class="doc-desc-title">thank-you page</span> is displayed to the
         customer when a <span class="doc-desc-title">Client</span> submits a new
         ticket.
+        <br/><br/>
+        <span class="doc-desc-title">Thank you</span> pages can be
+        associated with help topics.
 
 logos:
     title: Logos
diff --git a/include/staff/settings-pages.inc.php b/include/staff/settings-pages.inc.php
index bef09743f1ea2c45e9238f6e874645d07161b0f6..c92f441442823cfd279a4b21909d9267b44a3f91 100644
--- a/include/staff/settings-pages.inc.php
+++ b/include/staff/settings-pages.inc.php
@@ -32,6 +32,7 @@ $pages = Page::getPages();
         <tr>
             <td width="220" class="required">Landing Page:</td>
             <td>
+                <span>
                 <select name="landing_page_id">
                     <option value="">&mdash; Select Landing Page &mdash;</option>
                     <?php
@@ -43,11 +44,14 @@ $pages = Page::getPages();
                                 $page->getName());
                     } ?>
                 </select>&nbsp;<font class="error">*&nbsp;<?php echo $errors['landing_page_id']; ?></font>
+                <i class="help-tip icon-question-sign" href="#landing_page"></i>
+                </span>
             </td>
         </tr>
         <tr>
             <td width="220" class="required">Offline Page:</td>
             <td>
+                <span>
                 <select name="offline_page_id">
                     <option value="">&mdash; Select Offline Page &mdash;</option>
                     <?php
@@ -59,11 +63,14 @@ $pages = Page::getPages();
                                 $page->getName());
                     } ?>
                 </select>&nbsp;<font class="error">*&nbsp;<?php echo $errors['offline_page_id']; ?></font>
+                <i class="help-tip icon-question-sign" href="#offline_page"></i>
+                </span>
             </td>
         </tr>
         <tr>
             <td width="220" class="required">Default Thank-You Page:</td>
             <td>
+                <span>
                 <select name="thank-you_page_id">
                     <option value="">&mdash; Select Thank-You Page &mdash;</option>
                     <?php
@@ -75,6 +82,8 @@ $pages = Page::getPages();
                                 $page->getName());
                     } ?>
                 </select>&nbsp;<font class="error">*&nbsp;<?php echo $errors['thank-you_page_id']; ?></font>
+                <i class="help-tip icon-question-sign" href="#default_thank_you_page"></i>
+                </span>
             </td>
         </tr>
     </tbody>
@@ -83,7 +92,9 @@ $pages = Page::getPages();
     <thead>
         <tr>
             <th colspan="2">
-                <h4>Logos</h4>
+                <h4>Logos
+                    <i class="help-tip icon-question-sign" href="#logos"></i>
+                    </h4>
                 <em>System Default Logo</em>
             </th>
         </tr>
diff --git a/scp/css/scp.css b/scp/css/scp.css
index dd3f9a092ffa9774856d1860843e335baef57d06..add14aca2d3796626e524ebe4f5905e6f420599c 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -1153,6 +1153,9 @@ h2 > i.help-tip {
     vertical-align: baseline;
     font-size: 11pt;
 }
+.form_table th h4 i.help-tip {
+    color: white;
+}
 
 /* Knowledgebase */
 /* Knowledgebase */