diff --git a/include/i18n/en_US/help/tips/dashboard.dashboard.yaml b/include/i18n/en_US/help/tips/dashboard.dashboard.yaml
index ea4aee0c6cb79c6d5119f5c522670dcb55f475f6..98603045dd488706eeb46d12b38f6fc3236ba267 100644
--- a/include/i18n/en_US/help/tips/dashboard.dashboard.yaml
+++ b/include/i18n/en_US/help/tips/dashboard.dashboard.yaml
@@ -22,7 +22,7 @@ ticket_activity:
         broad overview of the whole system’s data (i.e., population). However, you
         may navigate through the <span class="doc-desc-title">Statistics
         </span> table below to focus on a narrower subject of interest (e.g.,
-        Department, Topics, or Staff. Additionally, you may export any data
+        Department, Topics, or Staff). Additionally, you may export any data
         currently displayed in the <span class="doc-desc-title">Statistics
         </span> table.
 
@@ -30,7 +30,7 @@ report_timeframe:
     title: Report timeframe
     content: >
         Choose a start date for the desired data sample using the date picker.
-        Then, choose the length of time from that date (i.e., the end date) to
+        Then, choose the length of time from that date to
         define the end date for your data sample.
 
 statistics:
diff --git a/include/i18n/en_US/help/tips/dashboard.my_profile.yaml b/include/i18n/en_US/help/tips/dashboard.my_profile.yaml
index 8eab8b6127a047535cce2532d44ee91f2e33360f..821fc0bbee69fe5e56bcc5a1d886042a44e35162 100644
--- a/include/i18n/en_US/help/tips/dashboard.my_profile.yaml
+++ b/include/i18n/en_US/help/tips/dashboard.my_profile.yaml
@@ -21,10 +21,11 @@ username:
     title: Username
     content: >
         Only those Agents with Admin status may change a username. If you are an
-        Agent with Admin privileges, you can accomplish this under the <span
-        class="doc-desc-title">Agent</span> (Staff)<span class="doc-desc-title">
-       </span> tab in the Admin Panel. (To change a username, including your own,
-        see, Admin Panel -> Agent (Staff) -> Agent (Staff) Members).
+        Agent with Admin privileges, you may accomplish this by selecting an Agent
+        to edit from the <span class="doc-desc-title">Staff Members</span> table.
+    links:
+      - title: Change a username as an Administrator
+        href: /scp/staff.php
 
 time_zone:
     title: Time Zone
@@ -53,9 +54,10 @@ default_paper_size:
 show_assigned_tickets:
     title: Show Assigned Tickets
     content: >
-        If enabled, your name will be hidden from the Open Tickets queue for those
-        tickets which you have been assigned. Upon hiding, the Department name to
-        which you belong will replace where your name is normally displayed.
+        Enable this to hide your name from the <span class="doc-desc-title">Open 
+        Tickets</span> queue for those tickets which you have been assigned. Upon 
+        hiding, the <span class="doc-desc-title">Department</span> name to which
+        you belong will replace where your name would normally be displayed.
 
 password:
     title: Password
@@ -76,7 +78,11 @@ confirm_new_password:
 signature:
     title: Signature
     content: >
-        What you create here will be an optional Signature that perhaps appears at
-        the end of your Ticket Responses. Whether this Signature appears, or not,
-        depends on the Email Template that will be used in a Ticket Response. (To
-        create Email Templates, see Admin Panel -> Emails -> Templates ).
+        Create an optional <span class="doc-desc-title">Signature</span> 
+        that perhaps appears at the end of your Ticket Responses. Whether this 
+        <span class="doc-desc-title">Signature</span> appears, or not, depends 
+        on the <span class="doc-desc-title">Email Template</span> that will be 
+        used in a Ticket Response. 
+    links:
+      - title: Create Emails Templates in the Admin Panel
+        href: /scp/templates.php
diff --git a/include/i18n/en_US/help/tips/dashboard.staff_directory.yaml b/include/i18n/en_US/help/tips/dashboard.staff_directory.yaml
index 769789feebb18ffa12da2254416c34cdaeee7fd8..616c421713c72a8ada163eed16fc350fe62f69cd 100644
--- a/include/i18n/en_US/help/tips/dashboard.staff_directory.yaml
+++ b/include/i18n/en_US/help/tips/dashboard.staff_directory.yaml
@@ -17,21 +17,12 @@ staff_members:
     title: Staff Members
     content: >
         The following table displays the results of the filter above it. If no filter
-        settings are chosen, then all <span class="doc-desc-title">Agent</span>
-        (Staff) <span class="doc-desc-title">Members</span> are displayed, and
-        broken up by pages. See the pages section below to navigate through more
-        results.
+        settings are chosen, then all <span class="doc-desc-title">Staff Members
+        </span> are displayed, and broken up by pages. See the pages section
+         below to navigate through more results.
 
 apply_filtering_criteria:
     title: Apply Filtering Criteria
     content: >
-        Choose a Department that is relevant to your current interests. You may
-        also perform a search for a specific Agent.
-
-showing:
-    title: Showing…
-    content: >
-        Be sure to check the <span class="doc-desc-title">Page</span> section below
-        to ensure that there are not more pages displaying more <span
-        class="doc-desc-title">Agent</span> (Staff)<span class="doc-desc-title">
-        Members.</span>
+        Choose a <span class="doc-desc-title">Department</span> that is relevant to your 
+        current interests. You may also perform a search for a specific Agent.
diff --git a/include/i18n/en_US/help/tips/dashboard.system_logs.yaml b/include/i18n/en_US/help/tips/dashboard.system_logs.yaml
index 85736e59ea5b45a97f5eaae23e7f3c5ad10d5a14..7667d5f4a2721023f27c01e3a8efe59ac85580aa 100644
--- a/include/i18n/en_US/help/tips/dashboard.system_logs.yaml
+++ b/include/i18n/en_US/help/tips/dashboard.system_logs.yaml
@@ -18,10 +18,10 @@ system_logs:
     content: >
         If there is anything that is not working correctly, this is the place to
         start. This is where you will find any troubleshooting related logging
-        activity (e.g., Errors, Warnings, or Bugs). To hone in on a specific type,
-        see the <span class="doc-desc-title">Type</span> dropdown box.
-        Additionally, the type of events that are included in the System Logs can
-        be customized under <span class="doc-desc-title">System Settings</span>.
+        activity (e.g., Errors, Warnings, or Bugs). 
+    links:
+      - title: Customize what type of activity is logged by changing the <br /><span class="doc-desc-title">Default Log Level</span>.
+        href: /scp/settings.php?t=system
 
 date_span:
     title: Date Span
@@ -32,7 +32,10 @@ date_span:
 type:
     title: Type
     content: >
-        Select the System Log type of interest.
+        Choose an option to narrow your focus on a specific type of activity. 
+        <span class="doc-desc-opt">Debug</span> represents the least 
+        severity, and <span class="doc-desc-opt">Error</span> represents 
+        the greatest severity.
 
 showing_logs:
     title: Showing&hellip;Logs
diff --git a/include/i18n/en_US/help/tips/emails.addnew_email.yaml b/include/i18n/en_US/help/tips/emails.addnew_email.yaml
index 2a98b9375859d45cd31bfa10b12d462b66d7c040..95834ec6447e218f48d6fb3fa9b611b5b4d18a76 100644
--- a/include/i18n/en_US/help/tips/emails.addnew_email.yaml
+++ b/include/i18n/en_US/help/tips/emails.addnew_email.yaml
@@ -29,12 +29,6 @@ setting:
     title: Setting
     content: >
 
-login_information:
-    title: Login Information
-    content: >
-        While this is optional, it is required if IMAP/POP or SMTP (with
-        authorization) are enabled.
-
 username:
     title: Username
     content: >
@@ -43,10 +37,19 @@ password:
     title: Password
     content: >
 
+login_information:
+    title: Login Information
+    content: >
+        While this is optional, it is required if IMAP/POP or SMTP (with
+        authorization) are enabled.
+
 mail_account:
     title: Mail Account
     content: >
-
+        Optional setting for fetching incoming emails. Mail fetching must be enabled with autocron active or external cron setup.
+    links:
+      - title: Manage <span class="doc-desc-title">Email Polling</span> &amp; <span class="doc-desc-title">AutoCron</span> settings.
+        href: /scp/settings.php?t=emails
 status:
     title: Status
     content: >
@@ -82,6 +85,8 @@ fetched_emails:
 smtp_settings:
     title: SMTP Settings
     content: >
+        When enabled, the <span class="doc-desc-title">email account</span> will use 
+        the SMTP server instead of internal PHP mail() function for outgoing emails.
 
 status:
     title: Status
diff --git a/include/i18n/en_US/help/tips/emails.diagnostic.yaml b/include/i18n/en_US/help/tips/emails.diagnostic.yaml
index 065f031ba6618fc09b69f7dd6c91fe43766b2365..24c87251262174be86d562f6c84352f8e121ef44 100644
--- a/include/i18n/en_US/help/tips/emails.diagnostic.yaml
+++ b/include/i18n/en_US/help/tips/emails.diagnostic.yaml
@@ -18,6 +18,9 @@ test_outgoing_email:
     content: >
         The email’s delivery depends on your server settings (php.ini) and/or SMTP
         configuration.
+    links:
+      - title: Select an email to configure SMTP (Outgoing) Settings
+        href: /scp/emails.php
 
 from:
     title: From
diff --git a/include/i18n/en_US/help/tips/emails.email_template_form.yaml b/include/i18n/en_US/help/tips/emails.email_template_form.yaml
index 3a119c9d915df2865c1c146ad99313d1a949bd99..8621207a9c786f4924ee75d050c0d7777f2b634b 100644
--- a/include/i18n/en_US/help/tips/emails.email_template_form.yaml
+++ b/include/i18n/en_US/help/tips/emails.email_template_form.yaml
@@ -28,8 +28,8 @@ name:
 status:
     title: Status
     content: >
-        If disabled, the Template will not be visible as an option when
-        creating/editing a Department.
+        Enable this template so that it will be visible as an option when
+        creating/editing a <span class="doc-desc-title">Department</span>.
 
 language:
     title: Language
@@ -40,12 +40,13 @@ language:
 template_to_clone:
     title: Template to Clone
     content: >
-        If this is your first time creating a new Email Template, simply choose the
-        Default Template in the list to clone. Each Template contains a set of
-        customized Alerts, Responses, Notices, etc. that are utilized depending on
-        the relevant event that triggers them. By cloning Template Sets, you are
-        able to create Templates that only differ minimally without having to
-        recreate the details they have in common.
+        Choose the <span class="doc-desc-opt">Default Template</span> to clone
+        if this is your first time creating an <span class="doc-desc-title">Email Template</span>. Each Template 
+        contains a set of customized Alerts, Responses, Notices, etc. that are utilized 
+        depending on the relevant event that triggers them. By cloning <span 
+        class="doc-desc-title">Template Sets</span>, you are able to create <span 
+        class="doc-desc-title">Templates</span> that only differ minimally without 
+        having to recreate the details they have in common.
 
 admin_notes:
     title: Admin Notes
diff --git a/include/i18n/en_US/help/tips/knowledgebase.addnew_canned_response.yaml b/include/i18n/en_US/help/tips/knowledgebase.addnew_canned_response.yaml
index 0a524811b8ec7ee92aa6a872e0e1110366f5fa1c..67a39c729c6ea90e557557a1964cd429b999fc90 100644
--- a/include/i18n/en_US/help/tips/knowledgebase.addnew_canned_response.yaml
+++ b/include/i18n/en_US/help/tips/knowledgebase.addnew_canned_response.yaml
@@ -16,6 +16,15 @@
 canned_response:
     title: Canned Response
     content: >
+        Create a <span class="doc-desc-title">Canned Response</span> that can 
+        be included in a ticket response. In fact, you may include as many 
+        <span class="doc-desc-title">Canned Responses</span> as you would like
+        in a ticket response. It can also be included in the <span 
+        class="doc-desc-title">Ticket Auto-Response</span> setup by a <span 
+        class="doc-desc-title">Ticket Filter</span>.
+    links:
+      - title: Setup a Ticket Filter
+        href: /scp/filters.php
 
 canned_response_settings:
     title: Canned Response Settings
@@ -24,23 +33,20 @@ canned_response_settings:
 status:
     title: Status
     content: >
-
+        Disable your new <span class="doc-desc-title">Canned Response</span>
+        if you do not want it to be available to Agents immediately upon creation.
+        
 department:
     title: Department
     content: >
 
-canned_response:
-    title: Canned Response
-    content: >
-
 title:
     title: Title
     content: >
 
-canned_response:
-    title: Canned Response
-    content: >
-
 canned_attachments:
     title: Canned Attachments
     content: >
+        Attach a file  that you would like to be automatically included
+        in the ticket response that utilizes the new <span class="doc-desc-title">
+        Canned Response</span>.
diff --git a/include/i18n/en_US/help/tips/knowledgebase.addnew_faq.yaml b/include/i18n/en_US/help/tips/knowledgebase.addnew_faq.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..0c9d272d870549bc4b799a420f61b0450ed8502c
--- /dev/null
+++ b/include/i18n/en_US/help/tips/knowledgebase.addnew_faq.yaml
@@ -0,0 +1,23 @@
+#
+# This is popup help messages for the Staff Panel -> Knowledgebase -> FAQ -> Add New FAQ
+#
+# Fields:
+# title - Shown in bold at the top of the popover window
+# content - The body of the help popover
+# links - List of links shows below the content
+#   title - Link title
+#   href - href of link (links starting with / are translated to the
+#       helpdesk installation path)
+#
+# The key names such as 'helpdesk_name' should not be translated as they
+# must match the HTML #ids put into the page template.
+#
+---
+listing_type:
+    title: Listing Type
+    content: >
+        Choose <span class="doc-desc-opt">Public (publish)</span> if you would like this <span class="doc-desc-title">
+        FAQ</span> to be published on public knowledgebase if the parent category is public.
+    links:
+      - title: Enable the Public Knowledgebase for the Client Portal
+        href: /scp/settings.php?t=kb
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/knowledgebase.canned_responses.yaml b/include/i18n/en_US/help/tips/knowledgebase.canned_responses.yaml
index 13276a8cb230411242a2a2953473eddea66e6e03..d4f3c913410a6ece7def3ed527704f94c2651fae 100644
--- a/include/i18n/en_US/help/tips/knowledgebase.canned_responses.yaml
+++ b/include/i18n/en_US/help/tips/knowledgebase.canned_responses.yaml
@@ -21,7 +21,8 @@ canned_responses:
     title: Canned Responses
     content: >
         Create responses to your more frequently asked questions to expedite
-        customer support. You can also upload attachments to Canned Responses.
+        Client support. You can also upload attachments to <span 
+        class="doc-desc-title">Canned Responses</span>.
 
 showing_premade_responses:
     title: Showing… Premade Responses
diff --git a/include/i18n/en_US/help/tips/knowledgebase.categories.yaml b/include/i18n/en_US/help/tips/knowledgebase.categories.yaml
index 5350f5ee18108a0acdbb044b133f8e4ffc4f9cd1..f715307e631dd840853a6d787bb7044cac7cea4d 100644
--- a/include/i18n/en_US/help/tips/knowledgebase.categories.yaml
+++ b/include/i18n/en_US/help/tips/knowledgebase.categories.yaml
@@ -16,7 +16,8 @@
 faq_categories:
     title: FAQ Categories
     content: >
-        Categories must first be created before any FAQs can be published.
+        Categories must first be created before any <span class="doc-desc-title">
+        FAQs</span> can be published.
 
 setting:
     title: Setting
diff --git a/include/i18n/en_US/help/tips/knowledgebase.faqs.yaml b/include/i18n/en_US/help/tips/knowledgebase.faqs.yaml
index d9649740b99b963b86ff843929b101829109746f..2c257c8d632dc53442b9676c364bdc7a910eeaf3 100644
--- a/include/i18n/en_US/help/tips/knowledgebase.faqs.yaml
+++ b/include/i18n/en_US/help/tips/knowledgebase.faqs.yaml
@@ -13,6 +13,18 @@
 # must match the HTML #ids put into the page template.
 #
 ---
+page_header:
+    title: Frequently Asked Questions
+    content: >
+        You must first create <span class="doc-desc-title">Categories</span> 
+        before any <span class="doc-desc-title">FAQs</span> can be published.
+        It is also recommended that you create <span class="doc-desc-title">Help 
+        Topics</span> before adding <span class="doc-desc-title">FAQs</span>.
+    links:
+      - title: Create Categories
+        href: /scp/categories.php
+      - title: Create Help Topics
+        href: /scp/helptopics.php
 search_box:
     title: Search for Articles
     content: >
@@ -29,3 +41,8 @@ resulted_listings:
     title: Resulted Listings
     content: >
 
+listed_categories:
+    title: Adding FAQs&hellip;
+    content: >
+        Select one of your categories below to add
+        <span class="doc-desc-title">FAQs</span> within it.
diff --git a/include/i18n/en_US/help/tips/settings.email.yaml b/include/i18n/en_US/help/tips/settings.email.yaml
index 82376aa8c1f75df21a7b2bd6d9c5588864d7ab9f..de1a41d4acf0ba110b875a67f1db1ba25ad35247 100644
--- a/include/i18n/en_US/help/tips/settings.email.yaml
+++ b/include/i18n/en_US/help/tips/settings.email.yaml
@@ -37,8 +37,8 @@ default_system_email:
 default_alert_email:
     title: Default Alert Email
     content: >
-        Choose an Email Address from which <span class="doc-desc-title">Alerts &amp;
-        Notices</span> are sent to Agents. Note, however, that if the <span
+        Choose an Email Address from which Agents are sent <span class="doc-desc-title">Alerts &amp;
+        Notices</span>. Note, however, that if the <span
         class="doc-desc-title">Department</span> or <span
         class="doc-desc-title">Help Topic</span> sets its own <span
         class="doc-desc-title">Default Email Address</span>, that <span
@@ -72,33 +72,37 @@ strip_quoted_reply:
     content: >
         If enabled, this will remove any preceding correspondences duplicated
         between response communication. Thereby, the Agent &amp; Client, when viewing
-        the Ticket, will not see any one preceding message duplicated. Note, this
-        will not actually delete preceding communication; it will only hide it from
-        the Agent &amp; Client.
+        the Ticket, will not see any one preceding message duplicated. <br /><br />
+        <strong>Note:</strong> this will not actually delete preceding communication; it will only hide it from
+        the Agent &amp; Client. Furthermore, this feature is relationally dependent
+        on the <span class="doc-desc-title">Reply Separator Tag</span> below.
 
 reply_separator_tag:
     title: Reply Separator Tag
     content: >
         This is the string that will tell the engine that anything below this line
         is old correspondence. This way the engine knows to remove it from the
-        Client or Agent’s sight. Note, this is only relevant if <span
+        Client or Agent’s sight. <br /><br />
+        <strong>Note:</strong> this is only relevant if <span
         class="doc-desc-title">Strip Quoted Reply</span> is enabled above.
 
 emailed_tickets_priority:
     title: Emailed Tickets Priority
     content: >
-        Enable this to use <span class="doc-desc-title">Email priority</span> when
-        available which honor the priority flag set in incoming email. If enabled,
-        the priority of new tickets will be set by the priority of the email used
-        to create them, if available.
+        Choose whether you would like the priority option of the email service 
+        (e.g., Yahoo, Gmail, etc.) to dictate the new ticket’s priority status. This 
+        setting can be overridden by a <span class="doc-desc-title">Ticket 
+        Filter</span>.
+    links:
+      - title: Create &amp; Manage Ticket Filters
+        href: /scp/filters.php
 
 accept_email_collaborators:
     title: Accept Email Collaborators
     content: >
-        Add participants included in the <code><span
-        class="doc-desc-title">To</span></code> and <code><span
-        class="doc-desc-title">CC</span></code> fields of email as ticket
-        collaborators.<br><br>
+        Add participants included in the <code><strong>To</strong></code> 
+        and <code><strong>CC</strong></code> fields of email as ticket
+        collaborators.<br /><br />
          <em>Collaborators can always be added manually by staff members when
         viewing a ticket.</em>
 
diff --git a/include/i18n/en_US/help/tips/settings.system.yaml b/include/i18n/en_US/help/tips/settings.system.yaml
index cb718d87e2c60b01f4bc243164acb17afc667064..826d8de46223f5a30b1ad45626a3e5f6de1f454b 100644
--- a/include/i18n/en_US/help/tips/settings.system.yaml
+++ b/include/i18n/en_US/help/tips/settings.system.yaml
@@ -13,6 +13,12 @@
 # must match the HTML #ids put into the page template.
 #
 ---
+general_settings:
+    title: General Settings
+    content: >
+        Offline mode will disable client interface and only allow admins to login to 
+        Staff Control Panel.
+
 helpdesk_status:
     title: Helpdesk Status
     content: >
@@ -86,3 +92,6 @@ date_time_options:
         change how these appear by following the PHP date format characters. The
         following examples are not realtime; they simply display the format for the
         values in the text input fields to their left.
+    links:
+      - title: See the PHP Date Formatting Table
+        href: http://www.php.net/manual/en/function.date.php
diff --git a/include/i18n/en_US/help/tips/settings.ticket.yaml b/include/i18n/en_US/help/tips/settings.ticket.yaml
index 2692e9921091341921296cbb2da27da4e71b813a..b47755b4e4dcd878981cb13761d468586f42d66d 100644
--- a/include/i18n/en_US/help/tips/settings.ticket.yaml
+++ b/include/i18n/en_US/help/tips/settings.ticket.yaml
@@ -18,7 +18,11 @@ global_ticket_settings_options:
     content: >
         These settings are <span class="doc-desc-title">global,</span> in that they
         apply until they are overridden by other possible system settings (e.g., a
-        Department’s SLA Plan overrides the Global Default SLA Plan set below).
+        <span class="doc-desc-title">Department’s SLA Plan</span> overrides the 
+        <span class="doc-desc-title">Global Default SLA Plan</span> set below).
+    links:
+      - title: Select a Department to edit its Default SLA Plan
+        href: /scp/departments.php
 
 ticket_ids:
     title: Ticket IDs
@@ -28,28 +32,35 @@ ticket_ids:
 default_sla:
     title: Default SLA
     content: >
-        Default SLA Plan to dictate how long a Ticket can remain Open before it is
-        rendered Overdue. (To create more SLA Plans, see Admin Panel -> Manage -⁠>
-        SLA Plans).
+        Choose the default Service Level Agreement to manage how long a Ticket
+        can remain Open before it is rendered Overdue.
+    links:
+      - title: Create more SLA Plans
+        href: scp/slas.php
 
 default_priority:
     title: Default Priority
     content: >
         Choose between Low, Normal, High &amp; Emergency for all tickets not
-        auto-assigned to a Help Topic or Department
+        auto-assigned to a Help Topic or Department.
 
 maximum_open_tickets:
     title: Maximum Open Tickets
     content: >
-        Enter the maximum Open Tickets a Client is permitted to have
-        simultaneously. This will help protect against spam and enable email flood
-        control. If you prefer to remove this limitation on Clients however,  enter
-        0 for unlimited.
+        Enter the maximum <em>number</em> of <span class="doc-desc-title">Open
+        Tickets</span> a Client is permitted to have simultaneously. This will help protect 
+        against spam and enable email flood control. Enter <span class="doc-desc-opt">0
+        </span> if you prefer to disable this limitation.
 
-ticket_auto_lock_priority:
-    title: Ticket Auto-lock Priority
+agent_collision_avoidance:
+    title: Agent Collision Avoidance
     content: >
-        Minutes to lock a ticket on activity - enter 0 to disable locking
+        Enter the length of time after an Agent stops ticket-response activity that a 
+        lockout period takes affect. This lockout prevents other Agents from sending 
+        a ticket response to the Client. It does not however prevent others from 
+        composing a draft. If the locking Agent sends their response, then any other 
+        Agent’s draft will be deleted. Enter <span class="doc-desc-opt">0</span> 
+        to disable the lockout feature.
 
 email_ticket_priority:
     title: Email Ticket Priority
@@ -65,33 +76,28 @@ show_related_tickets:
 human_verification:
     title: Human Verification
     content: >
-        Enable CAPTCHA on new web tickets. CAPTCHA is a type of challenge-response
-        test that typically only humans can pass. It displays a picture with text
-        inside of it so a bot/spider cannot readily read the text like a human can.
-        When the Client enters the text, it will check whether the Client’s input
-        matches  the text inside the image. GDLib is a software graphics library
-        that is required to run CAPTCHA.
+        Enable CAPTCHA on the Client Portal to verify an incoming ticket is the 
+        result of human activity.
 
 claim_tickets:
     title: Claim Tickets
     content: >
-        Not every ticket is immediately assigned to an Agent depending on System
-        Settings. However, when an eligible Agent responds to the Client for the
-        first time, that Agent will then be immediately assigned that Ticket if the
-        <span class="doc-desc-title">Claim Tickets</span> feature is enabled.
+        Enable this to auto-assign unassigned tickets to the initially responding Agent.
+        Also, reopened tickets are always assigned to the last respondent.
 
 assigned_tickets:
     title: Assigned Tickets
     content: >
-        If enabled, this will permit any Agent to see tickets that are assigned to
-        another specific Agent other than himself/herself.
+        Enable this feature to make visible (in the <span class="doc-desc-title">Open
+        Queue</span>) Ticket Assignments that do not belong to the current user.
 
 answered_tickets:
     title: Answered Tickets
     content: >
-        Show tickets that have been answered by staff  in open queue. If not check,
-        answered tickets will show up in a separate column until user responds,
-        thereby moving it to the opened queue.
+        Show tickets that have been answered by an Agent in the 
+        <span class="doc-desc-title">Open Queue</span>. If this is not enabled, 
+        answered tickets will be display in the <span class="doc-desc-title">Answered 
+        Tickets Queue</span>.
 
 staff_identity_masking:
     title: Staff Identity Masking
diff --git a/include/i18n/en_US/help/tips/tickets.queue.yaml b/include/i18n/en_US/help/tips/tickets.queue.yaml
index 2268790fab1faa608c9583417a4bf2d56c824475..a7145541614814f5d8bcfa29557d74380ccdb70a 100644
--- a/include/i18n/en_US/help/tips/tickets.queue.yaml
+++ b/include/i18n/en_US/help/tips/tickets.queue.yaml
@@ -20,13 +20,9 @@ search_field:
 advanced:
     title: Advanced
     content: >
-        Will allow you to narrow down your search parameters. Once you have
-        selected your advanced search criteria and run the search, you can export
-        the data at the bottom of the tickets page.
-
-refresh_button_:
-    title: Refresh (Button)
-    content: >
+        Narrow down your search parameters. Once you have selected your advanced
+        search criteria and run the search, you can <span class="doc-desc-title">Export
+        </span> the data at the bottom of the tickets page.
 
 open_tickets_table:
     title: Open Tickets Table
@@ -60,9 +56,9 @@ assigned_to:
 export:
     title: Export
     content: >
-        This will export your data currently in view in a printable HTML format.
-        You may select, then copy and paste this into your favorite word processor
-        (e.g., Microsoft Word).
+        Export your data currently in view in a CSV file.
+        CSV files may be opened with any spreadsheet software
+        (i.e., Microsoft Excel, Apple Pages, OpenOffice, etc.).
 
 advanced_search_dialog:
     title: Advanced Search
diff --git a/include/staff/cannedresponse.inc.php b/include/staff/cannedresponse.inc.php
index e689bf95644862b9918d1f35b9cb7014bae51b1c..e7f6d6d87d28c7e6d35a67e083d21ee876559390 100644
--- a/include/staff/cannedresponse.inc.php
+++ b/include/staff/cannedresponse.inc.php
@@ -27,7 +27,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
  <input type="hidden" name="do" value="<?php echo $action; ?>">
  <input type="hidden" name="a" value="<?php echo Format::htmlchars($_REQUEST['a']); ?>">
  <input type="hidden" name="id" value="<?php echo $info['id']; ?>">
- <h2>Canned Response</h2>
+ <h2>Canned Response&nbsp;<i class="help-tip icon-question-sign" href="#canned_response"></i></h2>
  <table class="form_table fixed" width="940" border="0" cellspacing="0" cellpadding="2">
     <thead>
         <tr><td></td><td></td></tr> <!-- For fixed table layout -->
@@ -42,9 +42,10 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         <tr>
             <td width="180" class="required">Status:</td>
             <td>
-                <input type="radio" name="isenabled" value="1" <?php echo $info['isenabled']?'checked="checked"':''; ?>>Active
-                <input type="radio" name="isenabled" value="0" <?php echo !$info['isenabled']?'checked="checked"':''; ?>>Disabled
+                <label><input type="radio" name="isenabled" value="1" <?php echo $info['isenabled']?'checked="checked"':''; ?>>&nbsp;Active&nbsp;</label>
+                <label><input type="radio" name="isenabled" value="0" <?php echo !$info['isenabled']?'checked="checked"':''; ?>>&nbsp;Disabled&nbsp;</label>
                 &nbsp;<span class="error">*&nbsp;<?php echo $errors['isenabled']; ?></span>
+                &nbsp;<i class="help-tip icon-question-sign" href="#status"></i>
             </td>
         </tr>
         <tr>
@@ -82,7 +83,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     data-draft-object-id="<?php if (isset($canned)) echo $canned->getId(); ?>"
                     style="width:98%;" class="richtext draft"><?php
                         echo $info['response']; ?></textarea>
-                <br><br><div><b>Canned Attachments</b> (optional) <font class="error">&nbsp;<?php echo $errors['files']; ?></font></div>
+                <br><br><div><b>Canned Attachments</b> (optional) &nbsp;<i class="help-tip icon-question-sign" href="#canned_attachments"></i><font class="error">&nbsp;<?php echo $errors['files']; ?></font></div>
                 <?php
                 if($canned && ($files=$canned->attachments->getSeparates())) {
                     echo '<div id="canned_attachments"><span class="faded">Uncheck to delete the attachment on submit</span><br>';
diff --git a/include/staff/cannedresponses.inc.php b/include/staff/cannedresponses.inc.php
index 59161ac0bfd66620695b3951d359d9719e49e854..39a8b75ee2b3ee30c17a4ecb01c30dfecf03d6dd 100644
--- a/include/staff/cannedresponses.inc.php
+++ b/include/staff/cannedresponses.inc.php
@@ -48,7 +48,7 @@ else
 
 ?>
 <div style="width:700px;padding-top:5px; float:left;">
- <h2>Canned Responses&nbsp;<i class="help-tip icon-question-sign" href="#canned_responses_table"></i></h2>
+ <h2>Canned Responses&nbsp;<i class="help-tip icon-question-sign" href="#canned_responses"></i></h2>
  </div>
 <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
     <b><a href="canned.php?a=add" class="Icon newReply">Add New Response</a></b></div>
diff --git a/include/staff/directory.inc.php b/include/staff/directory.inc.php
index 67289b97e4ac4f48972d55aae3c72063fdc17018..b922451076e984c61b95e870db888000bf2a1da9 100644
--- a/include/staff/directory.inc.php
+++ b/include/staff/directory.inc.php
@@ -92,7 +92,7 @@ else
     $showing='No staff members found!';
 ?>
 <table class="list" border="0" cellspacing="1" cellpadding="0" width="940">
-    <caption><?php echo $showing; ?>&nbsp;<i class="help-tip icon-question-sign" href="#showing"></i></caption>
+    <caption><?php echo $showing; ?></caption>
     <thead>
         <tr>
             <th width="160"><a <?php echo $name_sort; ?> href="directory.php?<?php echo $qstr; ?>&sort=name">Name</a></th>
diff --git a/include/staff/email.inc.php b/include/staff/email.inc.php
index 9be4743438cabc722855b8c2f73eb726995a9ea4..6f9079c0963a9f6d925b70b42c27d0f3cf8063a7 100644
--- a/include/staff/email.inc.php
+++ b/include/staff/email.inc.php
@@ -125,17 +125,17 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td width="180">
-                Auto-response
+                Auto-Response
             </td>
             <td>
-                <input type="checkbox" name="noautoresp" value="1" <?php echo $info['noautoresp']?'checked="checked"':''; ?> >
+                <label><input type="checkbox" name="noautoresp" value="1" <?php echo $info['noautoresp']?'checked="checked"':''; ?> >
                 <strong>Disable</strong> new ticket auto-response for this
-                email. Override global and dept. settings.
+                email. Override global and dept. settings.</label>
             </td>
         </tr>
         <tr>
             <th colspan="2">
-                <em><strong>Login Information:</strong>&nbsp;<i class="help-tip icon-question-sign" href="#login_information"></i></em>
+                <em><strong>Login Information</strong>&nbsp;<i class="help-tip icon-question-sign" href="#login_information"></i></em>
             </th>
         </tr>
         <tr>
@@ -161,14 +161,14 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <th colspan="2">
-                <em><strong>Mail Account</strong>: Optional setting for fetching incoming emails. Mail fetching must be enabled with autocron active or external cron setup. &nbsp;<font class="error">&nbsp;<?php echo $errors['mail']; ?></font></em>
+                <em><strong>Mail Account</strong>&nbsp;<i class="help-tip icon-question-sign" href="#mail_account"></i>&nbsp;<font class="error">&nbsp;<?php echo $errors['mail']; ?></font></em>
             </th>
         </tr>
         <tr><td>Status</td>
             <td>
-                <label><input type="radio" name="mail_active"  value="1"   <?php echo $info['mail_active']?'checked="checked"':''; ?> /><strong>Enable</strong></label>
+                <label><input type="radio" name="mail_active"  value="1"   <?php echo $info['mail_active']?'checked="checked"':''; ?> />&nbsp;Enable</label>
                 &nbsp;&nbsp;
-                <label><input type="radio" name="mail_active"  value="0"   <?php echo !$info['mail_active']?'checked="checked"':''; ?> />Disable</label>
+                <label><input type="radio" name="mail_active"  value="0"   <?php echo !$info['mail_active']?'checked="checked"':''; ?> />&nbsp;Disable</label>
                 &nbsp;<font class="error">&nbsp;<?php echo $errors['mail_active']; ?></font>
             </td>
         </tr>
@@ -216,26 +216,28 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr><td valign="top">Fetched Emails</td>
              <td>
-                <input type="radio" name="postfetch" value="archive" <?php echo ($info['postfetch']=='archive')? 'checked="checked"': ''; ?> >
-                 Move to: <input type="text" name="mail_archivefolder" size="20" value="<?php echo $info['mail_archivefolder']; ?>"/> folder.
+                <label><input type="radio" name="postfetch" value="archive" <?php echo ($info['postfetch']=='archive')? 'checked="checked"': ''; ?> >
+                 Move to: <input type="text" name="mail_archivefolder" size="20" value="<?php echo $info['mail_archivefolder']; ?>"/> folder.</label>
                     &nbsp;<font class="error">&nbsp;<?php echo $errors['mail_folder']; ?></font>
-                <input type="radio" name="postfetch" value="delete" <?php echo ($info['postfetch']=='delete')? 'checked="checked"': ''; ?> >
-                Delete fetched emails
-                <input type="radio" name="postfetch" value="" <?php echo (isset($info['postfetch']) && !$info['postfetch'])? 'checked="checked"': ''; ?> >
-                 Do nothing (Not recommended)
-              <br><em>Moving fetched emails to a backup folder is highly recommended.</em> &nbsp;<font class="error"><?php echo $errors['postfetch']; ?></font>
+                <label><input type="radio" name="postfetch" value="delete" <?php echo ($info['postfetch']=='delete')? 'checked="checked"': ''; ?> >
+                &nbsp;Delete fetched emails&nbsp;</label>
+                &nbsp;
+                <label><input type="radio" name="postfetch" value="" <?php echo (isset($info['postfetch']) && !$info['postfetch'])? 'checked="checked"': ''; ?> >
+                 &nbsp;Do nothing (Not recommended)&nbsp;</label>
+              <br /><em>Moving fetched emails to a backup folder is highly recommended.</em> &nbsp;<font class="error"><?php echo $errors['postfetch']; ?></font>
             </td>
         </tr>
 
         <tr>
             <th colspan="2">
-                <em><strong>SMTP Settings</strong>: When enabled the <b>email account</b> will use SMTP server instead of internal PHP mail() function for outgoing emails. &nbsp;<font class="error">&nbsp;<?php echo $errors['smtp']; ?></font></em>
+                <em><strong>SMTP Settings</strong>&nbsp;<i class="help-tip icon-question-sign" href="#smtp_settings"></i>&nbsp;<font class="error">&nbsp;<?php echo $errors['smtp']; ?></font></em>
             </th>
         </tr>
         <tr><td>Status</td>
             <td>
-                <label><input type="radio" name="smtp_active"  value="1"   <?php echo $info['smtp_active']?'checked':''; ?> />Enable</label>
-                <label><input type="radio" name="smtp_active"  value="0"   <?php echo !$info['smtp_active']?'checked':''; ?> />Disable</label>
+                <label><input type="radio" name="smtp_active"  value="1"   <?php echo $info['smtp_active']?'checked':''; ?> />&nbsp;Enable</label>
+                &nbsp;
+                <label><input type="radio" name="smtp_active"  value="0"   <?php echo !$info['smtp_active']?'checked':''; ?> />&nbsp;Disable</label>
                 &nbsp;<font class="error">&nbsp;<?php echo $errors['smtp_active']; ?></font>
             </td>
         </tr>
@@ -249,21 +251,22 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                 &nbsp;<font class="error">&nbsp;<?php echo $errors['smtp_port']; ?></font>
             </td>
         </tr>
-        <tr><td>Authentication Required?</td>
+        <tr><td>Authentication Required</td>
             <td>
 
                  <label><input type="radio" name="smtp_auth"  value="1"
-                    <?php echo $info['smtp_auth']?'checked':''; ?> />Yes</label>
+                    <?php echo $info['smtp_auth']?'checked':''; ?> />&nbsp;Yes</label>
+                 &nbsp;
                  <label><input type="radio" name="smtp_auth"  value="0"
-                    <?php echo !$info['smtp_auth']?'checked':''; ?> />NO</label>
+                    <?php echo !$info['smtp_auth']?'checked':''; ?> />&nbsp;No</label>
                 <font class="error">&nbsp;<?php echo $errors['smtp_auth']; ?></font>
             </td>
         </tr>
         <tr>
-            <td>Allow Header Spoofing?</td>
+            <td>Allow Header Spoofing</td>
             <td>
-                <input type="checkbox" name="smtp_spoofing" value="1" <?php echo $info['smtp_spoofing'] ?'checked="checked"':''; ?>>
-                Allow email header spoofing <em>(only applies to emails being sent through this account)</em>
+                <label><input type="checkbox" name="smtp_spoofing" value="1" <?php echo $info['smtp_spoofing'] ?'checked="checked"':''; ?>>
+                Allow email header spoofing <em>(only applies to emails being sent through this account)</em></label>
             </td>
         </tr>
         <tr>
diff --git a/include/staff/faq-categories.inc.php b/include/staff/faq-categories.inc.php
index 46095c2b54ff659c12f9133c83a8b82fd519cf88..2ba6fa343bab5c85593ea845e852c0da271ecf81 100644
--- a/include/staff/faq-categories.inc.php
+++ b/include/staff/faq-categories.inc.php
@@ -2,7 +2,7 @@
 if(!defined('OSTSTAFFINC') || !$thisstaff) die('Access Denied');
 
 ?>
-<h2>Frequently Asked Questions</h2>
+<h2>Frequently Asked Questions&nbsp;<i class="help-tip icon-question-sign" href="#page_header"></i></h2>
 <form id="kbSearch" action="kb.php" method="get">
     <input type="hidden" name="a" value="search">
     <div>
@@ -100,7 +100,7 @@ if($_REQUEST['q'] || $_REQUEST['cid'] || $_REQUEST['topicId']) { //Search.
         .' GROUP BY cat.category_id '
         .' ORDER BY cat.name';
     if(($res=db_query($sql)) && db_num_rows($res)) {
-        echo '<div>Click on the category to browse FAQs.</div>
+        echo '<div>Click on a category to add new FAQs or manage its existing FAQs.&nbsp;</div>
                 <ul id="kb">';
         while($row=db_fetch_array($res)) {
 
diff --git a/include/staff/faq.inc.php b/include/staff/faq.inc.php
index 8f412bdb69d27a4461dad20cd1f43aebe14b723a..56fa42dd62a6fadbbf8cf4169a005dd24d48a4c6 100644
--- a/include/staff/faq.inc.php
+++ b/include/staff/faq.inc.php
@@ -74,8 +74,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <td colspan=2>
-                <div><b>Listing Type</b>:&nbsp;
-                    <span class="faded">Published questions are listed on public knowledgebase if the parent category is public.</span></div>
+                <div><b>Listing Type</b>: &nbsp;<i class="help-tip icon-question-sign" href="#listing_type"></i></div>
                 <input type="radio" name="ispublished" value="1" <?php echo $info['ispublished']?'checked="checked"':''; ?>>Public (publish)
                 &nbsp;&nbsp;&nbsp;&nbsp;
                 <input type="radio" name="ispublished" value="0" <?php echo !$info['ispublished']?'checked="checked"':''; ?>>Internal (private)
diff --git a/include/staff/settings-emails.inc.php b/include/staff/settings-emails.inc.php
index aa2f653b7e65631d32d3c230c219b60cfef05eb9..a904af89caf0558201c1dcb5571802bafd056687 100644
--- a/include/staff/settings-emails.inc.php
+++ b/include/staff/settings-emails.inc.php
@@ -99,21 +99,20 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
             <td width="180">Strip Quoted Reply:</td>
             <td>
                 <input type="checkbox" name="strip_quoted_reply" <?php echo $config['strip_quoted_reply'] ? 'checked="checked"':''; ?>>
-                <em>(depends on the reply separator tag set below)</em>
+                &nbsp;Enable&nbsp;<i class="help-tip icon-question-sign" href="#strip_quoted_reply"></i>
                 &nbsp;<font class="error">&nbsp;<?php echo $errors['strip_quoted_reply']; ?></font>
             </td>
         </tr>
         <tr>
             <td width="180">Reply Separator Tag:</td>
             <td><input type="text" name="reply_separator" value="<?php echo $config['reply_separator']; ?>">
-                &nbsp;<font class="error">&nbsp;<?php echo $errors['reply_separator']; ?></font>
+                &nbsp;<font class="error">&nbsp;<?php echo $errors['reply_separator']; ?></font>&nbsp;<i class="help-tip icon-question-sign" href="#reply_separator_tag"></i>
             </td>
         </tr>
         <tr>
             <td width="180">Emailed Tickets Priority:</td>
             <td>
-                <input type="checkbox" name="use_email_priority" value="1" <?php echo $config['use_email_priority'] ?'checked="checked"':''; ?> >
-                <em>(Use email priority when available)</em>
+                <input type="checkbox" name="use_email_priority" value="1" <?php echo $config['use_email_priority'] ?'checked="checked"':''; ?> >&nbsp;Enable&nbsp;
                 <i class="help-tip icon-question-sign" href="#emailed_tickets_priority"></i>
             </td>
         </tr>
diff --git a/include/staff/settings-system.inc.php b/include/staff/settings-system.inc.php
index 814f3685349ed59308e408491f90aef951120b5b..77c80619b2ab17a9d8ab5b0aea1593c8b342e691 100644
--- a/include/staff/settings-system.inc.php
+++ b/include/staff/settings-system.inc.php
@@ -12,7 +12,7 @@ $gmtime = Misc::gmtime();
         <tr>
             <th colspan="2">
                 <h4>System Settings &amp; Preferences</h4>
-                <em><b>General Settings</b>: Offline mode will disable client interface and only allow admins to login to Staff Control Panel.</em>
+                <em><b>General Settings</b>&nbsp;<i class="help-tip icon-question-sign" href="#general_settings"></i></em>
             </th>
         </tr>
     </thead>
@@ -21,8 +21,8 @@ $gmtime = Misc::gmtime();
         <tr>
             <td width="220" class="required">Helpdesk Status:</td>
             <td>
-                <input type="radio" name="isonline"  value="1"   <?php echo $config['isonline']?'checked="checked"':''; ?> /><b>Online</b> (Active)
-                <input type="radio" name="isonline"  value="0"   <?php echo !$config['isonline']?'checked="checked"':''; ?> /><b>Offline</b> (Disabled)
+                <label><input type="radio" name="isonline"  value="1"   <?php echo $config['isonline']?'checked="checked"':''; ?> />&nbsp;<b>Online</b>&nbsp;</label>
+                <label><input type="radio" name="isonline"  value="0"   <?php echo !$config['isonline']?'checked="checked"':''; ?> />&nbsp;<b>Offline</b></label>
                 &nbsp;<font class="error">&nbsp;<?php echo $config['isoffline']?'osTicket offline':''; ?></font>
                 <i class="help-tip icon-question-sign" href="#helpdesk_status"></i>
             </td>
diff --git a/include/staff/settings-tickets.inc.php b/include/staff/settings-tickets.inc.php
index e8580cdb09aae25417cf9ed1f02fd45370e37517..d970bc95986088b1093764c2ca1b8188a6e13d8e 100644
--- a/include/staff/settings-tickets.inc.php
+++ b/include/staff/settings-tickets.inc.php
@@ -69,26 +69,24 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
             </td>
         </tr>
         <tr>
-            <td>Ticket Auto-lock Time:</td>
+            <td>Agent Collision Avoidance Duration:</td>
             <td>
                 <input type="text" name="autolock_minutes" size=4 value="<?php echo $config['autolock_minutes']; ?>">
-                <font class="error"><?php echo $errors['autolock_minutes']; ?></font> <i class="help-tip icon-question-sign" href="#ticket_auto_lock_priority"></i>
+                <font class="error"><?php echo $errors['autolock_minutes']; ?></font>&nbsp;minutes&nbsp;<i class="help-tip icon-question-sign" href="#agent_collision_avoidance"></i>
             </td>
         </tr>
         <tr>
             <td>Human Verification:</td>
             <td>
                 <input type="checkbox" name="enable_captcha" <?php echo $config['enable_captcha']?'checked="checked"':''; ?>>
-                Enable CAPTCHA on new web tickets.<em>(requires GDLib)</em> &nbsp;<font class="error">&nbsp;<?php echo $errors['enable_captcha']; ?></font><br/> <i class="help-tip icon-question-sign" href="#human_verification"></i>
+                Enable CAPTCHA on new web tickets.<em>(requires GDLib)</em> &nbsp;<font class="error">&nbsp;<?php echo $errors['enable_captcha']; ?></font>&nbsp;<i class="help-tip icon-question-sign" href="#human_verification"></i>
             </td>
         </tr>
         <tr>
             <td>Claim Tickets:</td>
             <td>
                 <input type="checkbox" name="auto_claim_tickets" <?php echo $config['auto_claim_tickets']?'checked="checked"':''; ?>>
-                Auto-assign unassigned tickets on response <i class="help-tip icon-question-sign" href="#claim_tickets"></i>
-                <!-- Help Tip:
-                     Reopened tickets are always assigned to the last respondent -->
+                &nbsp;Enable&nbsp;<i class="help-tip icon-question-sign" href="#claim_tickets"></i>
             </td>
         </tr>
         <tr>
diff --git a/include/staff/syslogs.inc.php b/include/staff/syslogs.inc.php
index 34c09a50f52dd8de2c3ec875651c46bbfb92dabb..13cb38cf8e52f97978f7cb5dbaf8446a36916231 100644
--- a/include/staff/syslogs.inc.php
+++ b/include/staff/syslogs.inc.php
@@ -83,16 +83,16 @@ else
     $showing='No logs found!';
 ?>
 
-<h2>System Logs</h2>
+<h2>System Logs&nbsp;<i class="help-tip icon-question-sign" href="#system_logs"></i></h2>
 <div id='filter' >
  <form action="logs.php" method="get">
     <div style="padding-left:2px;">
-        <b>Date Span</b>:
+        <b>Date Span</b>&nbsp;<i class="help-tip icon-question-sign" href="#date_span"></i>
         &nbsp;From&nbsp;<input class="dp" id="sd" size=15 name="startDate" value="<?php echo Format::htmlchars($_REQUEST['startDate']); ?>" autocomplete=OFF>
             &nbsp;&nbsp; to &nbsp;&nbsp;
             <input class="dp" id="ed" size=15 name="endDate" value="<?php echo Format::htmlchars($_REQUEST['endDate']); ?>" autocomplete=OFF>
             &nbsp;&nbsp;
-            &nbsp;Type:
+            &nbsp;Type&nbsp;<i class="help-tip icon-question-sign" href="#type"></i>
             <select name='type'>
                 <option value="" selected>All</option>
                 <option value="Error" <?php echo ($type=='Error')?'selected="selected"':''; ?>>Errors</option>
diff --git a/include/staff/template.inc.php b/include/staff/template.inc.php
index 0da57c3808ce3d948f80e1cf757040cfcdc3d585..41a7c1b90c140bea8edf4706f629391c4d6c17ac 100644
--- a/include/staff/template.inc.php
+++ b/include/staff/template.inc.php
@@ -50,8 +50,9 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                 Status:
             </td>
             <td>
-                <input type="radio" name="isactive" value="1" <?php echo $info['isactive']?'checked="checked"':''; ?>><strong>Active</strong>
-                <input type="radio" name="isactive" value="0" <?php echo !$info['isactive']?'checked="checked"':''; ?>>Disabled
+                <label><input type="radio" name="isactive" value="1" <?php echo $info['isactive']?'checked="checked"':''; ?>><strong>&nbsp;Active</strong></label>
+                &nbsp;
+                <label><input type="radio" name="isactive" value="0" <?php echo !$info['isactive']?'checked="checked"':''; ?>>&nbsp;Disabled</label>
                 &nbsp;<span class="error">*&nbsp;<?php echo $errors['isactive']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#status"></i>
             </td>
         </tr>
@@ -140,8 +141,8 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     }
                     ?>
                 </select>
-                &nbsp;<span class="error">*&nbsp;<?php echo $errors['tpl_id']; ?></span>
-                 <em>(select an existing template to copy and edit it thereafter)&nbsp;<i class="help-tip icon-question-sign" href="#template_to_clone"></i></em>
+                &nbsp;<span class="error">*&nbsp;<?php echo $errors['tpl_id']; ?></span><i class="help-tip icon-question-sign" href="#template_to_clone"></i>
+                 <em>Select an existing template to copy and edit thereafter.</em>
             </td>
         </tr>
         <?php } ?>
diff --git a/include/staff/templates/org-lookup.tmpl.php b/include/staff/templates/org-lookup.tmpl.php
index a7c82f5daa4f40149b2bd802df2eb3cb8b7374ee..370310dd13e217f038927e83d55190cf687a6bbb 100644
--- a/include/staff/templates/org-lookup.tmpl.php
+++ b/include/staff/templates/org-lookup.tmpl.php
@@ -3,9 +3,9 @@
 if (!$info['title'])
     $info['title'] = 'Organization Lookup';
 
-$msg_info = 'Search existing organizations or add a new one';
+$msg_info = 'Search existing organizations or add a new one.';
 if ($info['search'] === false)
-    $msg_info = 'Complete the form below to add a new organization';
+    $msg_info = 'Complete the form below to add a new organization.';
 
 ?>
 <div id="the-lookup-form">
diff --git a/scp/css/scp.css b/scp/css/scp.css
index 77d55671c4310f316f64b67f5db665c0844652db..cd76d90054025a398305b3742b1916177c8a281f 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -1773,7 +1773,7 @@ table.custom-info td {
     font-weight: bold;
     text-transform: capitalize;
 }
-.doc-desc-option {
+.doc-desc-opt {
     font-style: italic;
 }
 
diff --git a/scp/emailtest.php b/scp/emailtest.php
index 266f2ac143c652b35f665c92fa6096b9843d2a53..17af9a364eacd056e1e8c96b39e916d734f5d4e9 100644
--- a/scp/emailtest.php
+++ b/scp/emailtest.php
@@ -60,7 +60,7 @@ require(STAFFINC_DIR.'header.inc.php');
     <thead>
         <tr>
             <th colspan="2">
-                <em>Emails delivery depends on your server settings (php.ini) and/or email SMTP configuration.</em>
+                <em>Use the following form to test whether your <strong>Outgoing Email</strong> settings are properly established.&nbsp;<i class="help-tip icon-question-sign" href="#test_outgoing_email"></i></em>
             </th>
         </tr>
     </thead>
diff --git a/scp/faq.php b/scp/faq.php
index 75b7356e44114759ca1acc4a05f12c6ba58a27ad..3e9d2c643e535e9e9e029c45de03d98525170413 100644
--- a/scp/faq.php
+++ b/scp/faq.php
@@ -94,12 +94,15 @@ if($faq) {
     $inc='faq-view.inc.php';
     if($_REQUEST['a']=='edit' && $thisstaff->canManageFAQ())
         $inc='faq.inc.php';
+        $tip_namespace = 'knowledgebase.addnew_faq';
 }elseif($_REQUEST['a']=='add' && $thisstaff->canManageFAQ()) {
     $inc='faq.inc.php';
+    $tip_namespace = 'knowledgebase.addnew_faq';
 } elseif($category && $_REQUEST['a']!='search') {
     $inc='faq-category.inc.php';
 }
 $nav->setTabActive('kbase');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
 require_once(STAFFINC_DIR.'header.inc.php');
 require_once(STAFFINC_DIR.$inc);
 require_once(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/kb.php b/scp/kb.php
index 4f2bc33518fd0df9f62018ef14c9e325f33ce96e..365ec15644ea6569ec109403fc510255ab7668a1 100644
--- a/scp/kb.php
+++ b/scp/kb.php
@@ -24,6 +24,7 @@ if($category && $_REQUEST['a']!='search') {
     $inc='faq-category.inc.php';
 }
 $nav->setTabActive('kbase');
+$ost->addExtraHeader('<meta name="tip-namespace" content="knowledgebase.faqs" />');
 require_once(STAFFINC_DIR.'header.inc.php');
 require_once(STAFFINC_DIR.$inc);
 require_once(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/tickets.php b/scp/tickets.php
index aff50785f9fe3a1bf5b71c69f07b709f084b8a1f..9aebe65e154fda66c95edd7a97e2cc0c169e5411 100644
--- a/scp/tickets.php
+++ b/scp/tickets.php
@@ -622,7 +622,7 @@ if($ticket) {
 }
 
 $ost->addExtraHeader('<script type="text/javascript" src="js/ticket.js"></script>');
-$ost->addExtraHeader('<meta name="tip-namespace" content="tickets.open" />');
+$ost->addExtraHeader('<meta name="tip-namespace" content="tickets.queue" />');
 require_once(STAFFINC_DIR.'header.inc.php');
 require_once(STAFFINC_DIR.$inc);
 require_once(STAFFINC_DIR.'footer.inc.php');