diff --git a/.gitignore b/.gitignore
index 6e7535b0b92c9fd5d8c741d3c95ba4fe7c19630e..6b2cfdc9915083910c15ffa2f73c9e5ee7413dde 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ include/ost-config.php
 *.sw[a-z]
 .DS_Store
 .vagrant
+._.DS_Store
 Vagrantfile
 
 # Staging directory used for packaging script
diff --git a/include/ajax.users.php b/include/ajax.users.php
index 97b9ae7dc068a76d96add06aaa69543a5f22e0c9..43a7864b0bf801215d87b8a13d9e69230ad0519f 100644
--- a/include/ajax.users.php
+++ b/include/ajax.users.php
@@ -296,7 +296,7 @@ class UsersAjaxAPI extends AjaxController {
     static function _lookupform($form=null, $info=array()) {
 
         if (!$info or !$info['title'])
-            $info += array('title' => 'User Lookup');
+            $info += array('title' => 'Select or Create a Client');
 
         ob_start();
         include(STAFFINC_DIR . 'templates/user-lookup.tmpl.php');
diff --git a/include/i18n/en_US/help/tips/dashboard.dashboard.yaml b/include/i18n/en_US/help/tips/dashboard.dashboard.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6e663f40f67b482ac66e0dffd60728d5a3221257
--- /dev/null
+++ b/include/i18n/en_US/help/tips/dashboard.dashboard.yaml
@@ -0,0 +1,120 @@
+#
+# This is popup help messages for the Staff Panel -> Dashboard -> Dashboard
+#
+# 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.
+#
+---
+ticket_activity:
+    title: Ticket Activity
+    content: >
+        Select a date range to cause both the graph and the table (cf. <span
+        class='doc-desc-title'>Statistics</span>) below to focus on any
+        corresponding data for those dates. The graph below will always reflect  a
+        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
+        currently displayed in the <span class='doc-desc-title'>Statistics
+        </span> table.
+        
+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
+        define the end date for your data sample. 
+        
+statistics:
+    title: Statistics
+    content: >
+        Navigate to the subject of interest by clicking on the appropriate tab in
+        order to view the specific sample of data. Within the table, the circles
+        represent the size of the nominal data. Therefore, the larger the number in
+        a particular cell, the larger the adjacent circle will be. 
+        
+opened:
+    title: Opened
+    content: >
+        This represents the tickets opened by Agents (i.e., internally opened) and
+        not by Clients. 
+        
+assigned:
+    title: Assigned
+    content: >
+        The system tracks every event whereby a ticket is automatically or manually
+        assigned to a particular Department or Agent. Automatic assignments will
+        depend on established settings for <span class='doc-desc-title'>Help
+        Topics</span> and <span class='doc-desc-title'>Email Filters</span> in the
+        Admin Panel.
+        
+overdue:
+    title: Overdue
+    content: >
+        This is the amount of tickets that have violated the SLA Plan to which they
+        belonged.
+        
+closed:
+    title: Closed
+    content: >
+        This is the amount of tickets that were closed.
+        
+reopened:
+    title: Reopened
+    content: >
+        This is the amount of tickets that were reopened either by an Agent or by a
+        Client when he/she responded while the ticket was in a Closed status.
+        
+service_time:
+    title: Service Time
+    content: >
+        <span class='doc-desc-title'>Service time</span> is the duration of time
+        that begins at the opening of a ticket and ends when the ticket is closed.
+        The <span class='doc-desc-title'>Service Time</span> column here measures
+        the average Service Time per ticket, in hours, within the specified date
+        span.  
+        
+response_time:
+    title: Response Time
+    content: >
+        <span class='doc-desc-title'>Response Time</span> is a duration of time
+        that begins with any Client’s correspondence and ends when an Agent makes a
+        response. This measurement of time is not exclusive to a Client’s
+        correspondence of the initial Ticket opening. This refers to every act of
+        discourse originating with a Client.
+        
+export:
+    title: Export
+    content: >
+        You may export the data currently in view. Therefore,  the data that is
+        exported will be a direct reflection of whatever date span and specific
+        tabbed subject is currently specified when an <span
+        class='doc-desc-title'>Export</span> is requested. The file format is <span
+        class='doc-desc-title'>.csv</span>, which is compatible to any spreadsheet
+        application.
+        
+department:
+    title: Department
+    content: >
+        Choose this tab if you would like to see the Data of each column that is
+        specific to your Departments.
+        
+topics:
+    title: Topics
+    content: >
+        Choose this tab if you would like to see the Data of each column that is
+        specific to your Topics.
+        
+agents_staff_:
+    title: Agents (Staff)
+    content: >
+        Choose this tab if you would like to see the Data of each column that is
+        specific to your individual Agents.        
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/dashboard.my_profile.yaml b/include/i18n/en_US/help/tips/dashboard.my_profile.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..06f50d50b6a012d10645c6caa07bf50f13eb71eb
--- /dev/null
+++ b/include/i18n/en_US/help/tips/dashboard.my_profile.yaml
@@ -0,0 +1,123 @@
+#
+# This is popup help messages for the Staff Panel -> Dashboard -> My Profile
+#
+# 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.
+#
+---
+my_account_profile_table_:
+    title: My Account Profile (Table)
+    content: >
+        
+contact_information:
+    title: Contact Information
+    content: >
+        
+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).
+        
+first_name:
+    title: First Name
+    content: >
+        
+last_name:
+    title: Last Name
+    content: >
+        
+email_address:
+    title: Email Address
+    content: >
+        
+phone_number:
+    title: Phone Number
+    content: >
+        
+mobile_number:
+    title: Mobile Number
+    content: >
+        
+preferences:
+    title: Preferences
+    content: >
+        
+time_zone:
+    title: Time Zone
+    content: >
+        
+daylight_saving:
+    title: Daylight Saving
+    content: >
+        
+maximum_page_size:
+    title: Maximum Page Size
+    content: >
+        
+auto_refresh_rate:
+    title: Auto Refresh Rate
+    content: >
+        
+default_signature:
+    title: Default Signature
+    content: >
+        
+default_paper_size:
+    title: Default Paper Size
+    content: >
+        
+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.
+        
+password:
+    title: Password
+    content: >
+        
+current_password:
+    title: Current Password
+    content: >
+        
+new_password:
+    title: New Password
+    content: >
+        
+confirm_new_password:
+    title: Confirm New Password
+    content: >
+        
+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 ).
+        
+save_changes_button_:
+    title: Save Changes (Button)
+    content: >
+        
+reset_changes_button_:
+    title: Reset Changes (Button)
+    content: >
+        
+cancel_changes_button_:
+    title: Cancel Changes (Button)
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/dashboard.staff_directory.yaml b/include/i18n/en_US/help/tips/dashboard.staff_directory.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b130045f7c10f678689d70f04e23f3248fd02ed5
--- /dev/null
+++ b/include/i18n/en_US/help/tips/dashboard.staff_directory.yaml
@@ -0,0 +1,37 @@
+#
+# This is popup help messages for the Staff Panel -> Dashboard -> Staff Directory
+#
+# 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.
+#
+---
+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.  
+        
+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>
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/dashboard.system_logs.yaml b/include/i18n/en_US/help/tips/dashboard.system_logs.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3fbe875b0cceb3ee90fb9369b9f27578734f1607
--- /dev/null
+++ b/include/i18n/en_US/help/tips/dashboard.system_logs.yaml
@@ -0,0 +1,73 @@
+#
+# This is popup help messages for the Admin Panel -> Dashboard  -> System Logs page
+#
+# 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.
+#
+---
+system_logs:
+    title: 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>.
+        
+date_span:
+    title: Date Span
+    content: >
+        Narrow your calendar range that you would like to view in the <span
+        class="doc-desc-title">System Logs</span>.
+        
+type:
+    title: Type
+    content: >
+        Select the System Log type of interest.
+        
+showing_logs:
+    title: Showing...Logs
+    content: >
+        Be sure to check the <span class="doc-desc-title">Page</span> section below
+        to make sure that there are not more pages displaying available System
+        Logs.
+        
+log_title:
+    title: Log Title
+    content: >
+        Click the <span class="doc-desc-title">Log Title</span> table header if 
+        you would like to sort the results according to the <span 
+        class="doc-desc-title">Log Title</span>.
+        
+log_type:
+    title: Log Type
+    content: >
+        Click the <span class="doc-desc-title">Log Type</span> table header if you
+        would like to sort the results according to the <span
+        class="doc-desc-title">Log Type</span>.
+        
+log_date:
+    title: Log Date
+    content: >
+        This is the date the log was generated by the software. If you would like
+        to sort the results according to the <span class="doc-desc-title">Log
+        Date</span>, simply click the <span class="doc-desc-title">Log 
+        Date</span> table header. (Use the <span
+        class="doc-desc-title">Date Span</span> form above to narrow your calendar
+        span of logs.)
+        
+ip_address:
+    title: IP Address
+    content: >
+        This refers to the <span class="doc-desc-title">IP</span><span
+        class="doc-desc-title"> Address</span> of either the agent or client that
+        was using osTicket at the time the log was generated.
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/emails.addnew_email.yaml b/include/i18n/en_US/help/tips/emails.addnew_email.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1bdc990dccbf329e999f150c54ba1383507bb24f
--- /dev/null
+++ b/include/i18n/en_US/help/tips/emails.addnew_email.yaml
@@ -0,0 +1,121 @@
+#
+# This is popup help messages for the Admin Panel -> Emails -> Add New Email
+#
+# 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.
+#
+---
+email_information_settings:
+    title: Email Information &amp; Settings
+    content: >
+        
+email_address:
+    title: Email Address
+    content: >
+        
+email_name:
+    title: Email Name
+    content: >
+        
+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: >
+        
+password:
+    title: Password
+    content: >
+        
+mail_account:
+    title: Mail Account
+    content: >
+        
+status:
+    title: Status
+    content: >
+        
+host:
+    title: Host
+    content: >
+        
+port:
+    title: Port
+    content: >
+        
+protocol:
+    title: Protocol
+    content: >
+        
+encryption:
+    title: Encryption
+    content: >
+        
+fetch_frequency:
+    title: Fetch Frequency
+    content: >
+        
+emails_per_fetch:
+    title: Emails Per Fetch
+    content: >
+        
+fetched_emails:
+    title: Fetched Emails
+    content: >
+        
+smtp_settings:
+    title: SMTP Settings
+    content: >
+        
+status:
+    title: Status
+    content: >
+        
+smtp_host:
+    title: SMTP Host
+    content: >
+        
+smtp_port:
+    title: SMTP Port
+    content: >
+        
+authentication_required_:
+    title: Authentication Required?
+    content: >
+        
+allow_header_spoofing_:
+    title: Allow Header Spoofing?
+    content: >
+        
+internal_notes:
+    title: Internal Notes
+    content: >
+        
+submit_button_:
+    title: Submit (Button)
+    content: >
+        
+reset_button_:
+    title: Reset (Button)
+    content: >
+        
+cancel_button_:
+    title: Cancel (Button)
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/emails.banlist.yaml b/include/i18n/en_US/help/tips/emails.banlist.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d087e10ba19b23df1ef51967d60f914544b7f372
--- /dev/null
+++ b/include/i18n/en_US/help/tips/emails.banlist.yaml
@@ -0,0 +1,59 @@
+#
+# This is popup help messages for the Admin Panel -> Emails -> Banlist
+#
+# 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.
+#
+---
+ban_new_email:
+    title: Ban New Email
+    content: >
+        
+banned_email_addresses_table_:
+    title: Banned Email Addresses (Table)
+    content: >
+        
+query_search:
+    title: Query Search
+    content: >
+        
+showing_:
+    title: Showing…
+    content: >
+        
+email_address:
+    title: Email Address
+    content: >
+        
+ban_status:
+    title: Ban Status
+    content: >
+        
+date_added:
+    title: Date Added
+    content: >
+        
+last_updated:
+    title: Last Updated
+    content: >
+        
+enable_button_:
+    title: Enable (Button)
+    content: >
+        
+disable_button_:
+    title: Disable (Button)
+    content: >
+        
+delete_button_:
+    title: Delete (Button)
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/emails.diagnostic.yaml b/include/i18n/en_US/help/tips/emails.diagnostic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..2a69188db77103ab2fbab67c40375b9053e8015d
--- /dev/null
+++ b/include/i18n/en_US/help/tips/emails.diagnostic.yaml
@@ -0,0 +1,61 @@
+#
+# This is popup help messages for the Admin Panel -> Emails -> Diagnostics
+#
+# 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.
+#
+---
+test_outgoing_email_form_:
+    title: Test Outgoing Email (Form)
+    content: >
+        The email’s delivery depends on your server settings (php.ini) and/or SMTP
+        configuration.
+        
+from:
+    title: From
+    content: >
+        
+to:
+    title: To
+    content: >
+        
+subject:
+    title: Subject
+    content: >
+        
+message:
+    title: Message
+    content: >
+        
+draft_saved:
+    title: Draft Saved
+    content: >
+        
+trash_button_image_:
+    title: Trash (Button Image)
+    content: >
+        
+message_body_task_bar_:
+    title: Message Body (Task Bar)
+    content: >
+        
+send_message_button_:
+    title: Send Message (Button)
+    content: >
+        
+reset_button_:
+    title: Reset (Button)
+    content: >
+        
+cancel_button_:
+    title: Cancel (Button)
+    content: >
+        
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
new file mode 100644
index 0000000000000000000000000000000000000000..00b65c52e119024aa8963dfe45eb54ab5b080549
--- /dev/null
+++ b/include/i18n/en_US/help/tips/emails.email_template_form.yaml
@@ -0,0 +1,66 @@
+#
+# This is popup help messages for the Admin Panel -> Emails -> Email Template Form
+#
+# 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.
+#
+---
+add_new_template:
+    title: Add New Template
+    content: >
+        
+template_information:
+    title: Template Information
+    content: >
+        
+name:
+    title: Name
+    content: >
+        
+status:
+    title: Status
+    content: >
+        If disabled, the Template will not be visible as an option when
+        creating/editing a Department.
+        
+language:
+    title: Language
+    content: >
+        As our translation endeavors grow in development, more options will become
+        available.
+        
+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.
+        
+admin_notes:
+    title: Admin Notes
+    content: >
+        These notes are only visible to those whose account type is <span
+        class='doc-desc-title'>Admin</span>.
+        
+add_template_button_:
+    title: Add Template (Button)
+    content: >
+        
+reset_button_:
+    title: Reset (Button)
+    content: >
+        
+cancel_button_:
+    title: Cancel (Button)
+    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/emails.emails.yaml b/include/i18n/en_US/help/tips/emails.emails.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8b64b14feeaa4e1fea0d2fbcb9b515c30f7e0019
--- /dev/null
+++ b/include/i18n/en_US/help/tips/emails.emails.yaml
@@ -0,0 +1,51 @@
+#
+# This is popup help messages for the Admin Panel -> Emails -> Emails
+#
+# 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.
+#
+---
+add_new_email:
+    title: Add New Email
+    content: >
+        Custom lists are used to provide drop-down lists for custom forms.
+        
+email_addresses_table_:
+    title: Email Addresses (Table)
+    content: >
+        
+showing_emails:
+    title: Showing…Emails
+    content: >
+        
+email:
+    title: Email
+    content: >
+        
+priority:
+    title: Priority
+    content: >
+        
+department:
+    title: Department
+    content: >
+        
+created:
+    title: Created
+    content: >
+        
+last_updated:
+    title: Last Updated
+    content: >
+        
+delete_email_s_button_:
+    title: Delete Email(s) (Button)
+    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/emails.manage_banlist.yaml b/include/i18n/en_US/help/tips/emails.manage_banlist.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..729360c05bfb3ce4284300c411a8be518c2bf7f0
--- /dev/null
+++ b/include/i18n/en_US/help/tips/emails.manage_banlist.yaml
@@ -0,0 +1,48 @@
+#
+# This is popup help messages for the Admin Panel -> Emails -> Manage Email Ban List
+#
+# 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.
+#
+---
+add_new_email_address_to_ban_list:
+    title: Add New Email Address to Ban List
+    content: >
+        This form is accessed by clicking Ban New Email in the Banlist Section (To
+        get to Banlist, Admin Panel -> Emails -> Banlist).
+        
+filter_name:
+    title: Filter Name
+    content: >
+        
+ban_status:
+    title: Ban Status
+    content: >
+        
+email_address:
+    title: Email Address
+    content: >
+        
+internal_notes:
+    title: Internal Notes
+    content: >
+        
+add_button_:
+    title: Add (Button)
+    content: >
+        
+reset_button_:
+    title: Reset (Button)
+    content: >
+        
+cancel_button_:
+    title: Cancel (Button)
+    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/emails.templates.yaml b/include/i18n/en_US/help/tips/emails.templates.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b59e3fe5bf274f2aa6851ae7dc7ec0222c3c732e
--- /dev/null
+++ b/include/i18n/en_US/help/tips/emails.templates.yaml
@@ -0,0 +1,66 @@
+#
+# This is popup help messages for the Admin Panel -> Emails -> Templates
+#
+# 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.
+#
+---
+email_templates_table_:
+    title: Email Templates (Table)
+    content: >
+        Templates are used as auto-responses for various actions that can take
+        place during a  Ticket’s lifetime. Alerts are sent to Agents as assigned by
+        Department, Team, Help Topic or Group. Responses or Replies are intended
+        for the customer or user who created the Ticket. You can create your own
+        set of Templates for each Department and customize each message. We highly
+        suggest you copy the Default Templates to create a new set for editing. To
+        do this, click <span class='doc-desc-title'>Add New Template</span>, then
+        select the Default Template from the drop-down list next to <span
+        class='doc-desc-title'>Template to Clone</span>.
+        
+showing_templates:
+    title: Showing…Templates
+    content: >
+        Be sure to check the Page section below to ensure that there are not more
+        pages displaying more Agent (Staff) Members.
+        
+name:
+    title: Name
+    content: >
+        
+status:
+    title: Status
+    content: >
+        
+in_use:
+    title: In-Use
+    content: >
+        
+date_added:
+    title: Date Added
+    content: >
+        
+last_updated:
+    title: Last Updated
+    content: >
+        
+enable_button_:
+    title: Enable (Button)
+    content: >
+        
+disable_button_:
+    title: Disable (Button)
+    content: >
+        
+delete_button_:
+    title: Delete (Button)
+    content: >
+        
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
new file mode 100644
index 0000000000000000000000000000000000000000..e79db3179c4d0f37b561eab97924184ca5720d23
--- /dev/null
+++ b/include/i18n/en_US/help/tips/knowledgebase.addnew_canned_response.yaml
@@ -0,0 +1,75 @@
+#
+# This is popup help messages for the Staff Panel -> Knowledgebase -> Canned Responses -> Add New Response
+#
+# 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.
+#
+---
+canned_response_table_:
+    title: Canned Response (Table)
+    content: >
+        
+canned_response_settings:
+    title: Canned Response Settings
+    content: >
+        
+status:
+    title: Status
+    content: >
+        
+department:
+    title: Department
+    content: >
+        
+canned_response:
+    title: Canned Response
+    content: >
+        
+title:
+    title: Title
+    content: >
+        
+canned_response:
+    title: Canned Response
+    content: >
+        
+canned_response_task_bar_:
+    title: Canned Response (Task Bar)
+    content: >
+        
+draft_saved:
+    title: Draft Saved
+    content: >
+        
+trash_button_:
+    title: Trash (Button)
+    content: >
+        
+canned_attachments:
+    title: Canned Attachments
+    content: >
+        
+internal_notes:
+    title: Internal Notes
+    content: >
+        
+add_response_button_:
+    title: Add Response (Button)
+    content: >
+        
+reset_button_:
+    title: Reset (Button)
+    content: >
+        
+cancel_button_:
+    title: Cancel (Button)
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/knowledgebase.addnew_category.yaml b/include/i18n/en_US/help/tips/knowledgebase.addnew_category.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..04a7832d8e3cbc2a6673a8783bdf1d655344cff9
--- /dev/null
+++ b/include/i18n/en_US/help/tips/knowledgebase.addnew_category.yaml
@@ -0,0 +1,55 @@
+#
+# This is popup help messages for the Staff Panel -> Knowledgebase -> Add New Category -> FAQ Category (Form)
+#
+# 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.
+#
+---
+category_information:
+    title: Category Information
+    content: >
+        Once you have created categories, you can select the category that the FAQ
+        pertains to then select “Add New FAQ”.  Type in the Question that will be
+        visible, if the FAQ will be Public or Internal and type the Answer in the
+        text box. You can also attach a file to the FAQ.
+        
+category_type:
+    title: Category Type
+    content: >
+        
+category_name:
+    title: Category Name
+    content: >
+        
+category_description:
+    title: Category Description
+    content: >
+        
+category_description_task_bar_:
+    title: Category Description (Task Bar)
+    content: >
+        
+internal_notes:
+    title: Internal Notes
+    content: >
+        
+add_button_:
+    title: Add (Button)
+    content: >
+        
+reset_button_:
+    title: Reset (Button)
+    content: >
+        
+cancel_button_him:
+    title: Cancel (Button) Him
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/knowledgebase.canned_responses.yaml b/include/i18n/en_US/help/tips/knowledgebase.canned_responses.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..92f151332790dcdcab1a3969a59cb24e5c3aeae3
--- /dev/null
+++ b/include/i18n/en_US/help/tips/knowledgebase.canned_responses.yaml
@@ -0,0 +1,57 @@
+#
+# This is popup help messages for the Staff Panel -> Knowledgebase -> Canned Responses
+#
+# 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.
+#
+---
+add_new_response:
+    title: Add New Response
+    content: >
+        
+canned_responses_table:
+    title: Canned Responses (Table)
+    content: >
+        Create responses to your more frequently asked questions to expedite
+        customer support. You can also upload attachments to Canned Responses.
+        
+showing_premade_responses:
+    title: Showing… Premade Responses
+    content: >
+        
+title:
+    title: Title
+    content: >
+        
+status:
+    title: Status
+    content: >
+        
+department:
+    title: Department
+    content: >
+        
+last_updated:
+    title: Last Updated
+    content: >
+        
+enable_button_:
+    title: Enable (Button)
+    content: >
+        
+disable_button_:
+    title: Disable (Button)
+    content: >
+        
+delete_button_:
+    title: Delete (Button)
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/knowledgebase.categories.yaml b/include/i18n/en_US/help/tips/knowledgebase.categories.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..81102935fd966a3fff2e837ae11dd85405200ab3
--- /dev/null
+++ b/include/i18n/en_US/help/tips/knowledgebase.categories.yaml
@@ -0,0 +1,24 @@
+#
+# This is popup help messages for the Staff Panel -> Knowledgebase -> Categories
+#
+# 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.
+#
+---
+faq_categories:
+    title: FAQ Categories
+    content: >
+        Categories must first be created before any FAQs can be published.
+        
+setting:
+    title: Setting
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/knowledgebase.faqs.yaml b/include/i18n/en_US/help/tips/knowledgebase.faqs.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..d38517c82cba1af992b8a9c1fda15952d4c49714
--- /dev/null
+++ b/include/i18n/en_US/help/tips/knowledgebase.faqs.yaml
@@ -0,0 +1,35 @@
+#
+# This is popup help messages for the Staff Panel -> Knowledgebase -> FAQs
+#
+# 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.
+#
+---
+_text_input_:
+    title: (Text Input)
+    content: >
+        
+categories_drop_down_:
+    title: Categories (Drop Down)
+    content: >
+        
+help_topics_drop_down_:
+    title: Help Topics (Drop Down)
+    content: >
+        
+search_button_:
+    title: Search (Button)
+    content: >
+        
+resulted_listings:
+    title: Resulted Listings
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/manage.addnew_api.yaml b/include/i18n/en_US/help/tips/manage.addnew_api.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..b2204f43ec432cda17282831743516448c7ec3c6
--- /dev/null
+++ b/include/i18n/en_US/help/tips/manage.addnew_api.yaml
@@ -0,0 +1,50 @@
+#
+# This is popup help messages for the Admin Panel -> Manage -> Add New API Key
+#
+# 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.
+#
+---
+status:
+    title: Status
+    content: >
+        
+ip_address:
+    title: IP Address
+    content: >
+        
+services:
+    title: Services
+    content: >
+        
+can_create_tickets:
+    title: Can Create Tickets
+    content: >
+        Define various options (XML/JSON/Email) and how they will affect the user
+        experience.
+        
+can_execute_cron:
+    title: Can Execute Cron
+    content: >
+        Define Cron.
+        
+add_key_button_:
+    title: Add Key (Button)
+    content: >
+        
+reset_button_:
+    title: Reset (Button)
+    content: >
+        
+cancel_button_:
+    title: Cancel (Button)
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/manage.addnew_custom_list.yaml b/include/i18n/en_US/help/tips/manage.addnew_custom_list.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7b2c7e5be2c886b188472d4dabe691957ad57300
--- /dev/null
+++ b/include/i18n/en_US/help/tips/manage.addnew_custom_list.yaml
@@ -0,0 +1,68 @@
+#
+# This is popup help messages for the Admin Panel -> Manage -> Add New Custom List
+#
+# 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.
+#
+---
+custom_lists:
+    title: Custom Lists
+    content: >
+        Your custom lists will permit you to create dropdown boxes with predefined
+        options from which a Client can select in your Custom Forms. If you would
+        like to use this custom list as a target in your Ticket Filters, be sure to
+        add this list to your Ticket Details form.
+        
+name:
+    title: Name
+    content: >
+        
+plural_name:
+    title: Plural Name
+    content: >
+        
+sort_order:
+    title: Sort Order
+    content: >
+        
+list_s_initial_items:
+    title: List’s Initial Items
+    content: >
+        
+value:
+    title: Value
+    content: >
+        
+extra:
+    title: Extra
+    content: >
+        Abbreviations and such.
+        
+delete:
+    title: Delete
+    content: >
+        
+internal_notes:
+    title: Internal Notes
+    content: >
+        
+add_form_button_:
+    title: Add Form (Button)
+    content: >
+        
+reset_button_:
+    title: Reset (Button)
+    content: >
+        
+cancel_button_:
+    title: Cancel (Button)
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/manage.addnew_filter.yaml b/include/i18n/en_US/help/tips/manage.addnew_filter.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c7162fa5b29f8af02b9ae28f1e140961c329acde
--- /dev/null
+++ b/include/i18n/en_US/help/tips/manage.addnew_filter.yaml
@@ -0,0 +1,149 @@
+#
+# This is popup help messages for the Admin Panel -> Manage -> Add New Filter
+#
+# 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.
+#
+---
+filter_name:
+    title: Filter Name
+    content: >
+        
+execution_order:
+    title: Execution Order
+    content: >
+        Think of these numbers as seat numbers when boarding an airplane. Just like
+        First Class has lower seat numbers and boards the plane first, so here the
+        lower the number the closer a Ticket Filter is to being the first Filter
+        executed. You want to keep your strict and narrow filters (very small
+        matches) first and your broad filters (large amount of matches) last. If
+        you enable <span class='doc-desc-title'>Stop Processing Further on
+        Match</span>, then only the first matching Filter will be applied.
+        
+filter_status:
+    title: Filter Status
+    content: >
+        
+target:
+    title: Target
+    content: >
+        The Target is the source from whom the Ticket was created. So, for example,
+        if you choose Web Forms, you are saying that you want to apply  the Ticket
+        Filters to those tickets which originated from the Client Interface.
+        
+filter_rules:
+    title: Filter Rules
+    content: >
+        
+rules_matching_criteria:
+    title: Rules Matching Criteria
+    content: >
+        If you would like the filter to match any of the rules, and then stop,
+        choose Match Any. If you would like all rules of the filter to be matched,
+        choose Match All. 
+        
+basic_fields_criterion:
+    title: Basic Fields Criterion
+    content: >
+        The selectable options below this header are those elements which can be
+        found in any standard Ticket. Note: the Email option here indicates from
+        whom the Email was sent.
+        
+custom_fields_criterion:
+    title: Custom Fields Criterion
+    content: >
+        The selectable options below this header are the Custom Fields found in the
+        <span class='doc-desc-title'>Ticket Details</span> Form. If you would like
+        to use one of your <span class='doc-desc-title'>Custom Lists</span> as a
+        Field Criterion in your Ticket Filter, then you want to edit the Ticket
+        Details Form by adding your Custom List to the Ticket Details Form Fields. 
+        (To edit the Ticket Details Form, see Admin Panel -> Manage -> Forms ->
+        Ticket Details).
+        
+criterion_operator:
+    title: Criterion Operator
+    content: >
+        Choose an operator to control what kind of test is performed against the
+        chosen field on the left with the value entered in the text field on the
+        right. 
+        
+filter_actions:
+    title: Filter Actions
+    content: >
+        
+reject_ticket:
+    title: Reject Ticket
+    content: >
+        If this is enabled, all other choices of action below will be ignored.
+        
+reply_to_email:
+    title: Reply-To Email
+    content: >
+        This field is only relevant if the Target selected above is an Email
+        Address. When a Client opens a Ticket by sending an Email, the Client has
+        the option to enable a Reply To field in their Email client (e.g,. Gmail,
+        Outlook, etc.). This includes header information that informs the Inbound
+        Email Client (i.e., recipient) that the Sender is requesting that the Reply
+        be routed to a different Email Address from that which it was originally
+        sent. If the <span class='doc-desc-title'>Reply-To Email</span> feature is
+        enabled here, then osTicket will honor the Client’s request to respond to
+        their noted alternative Email Address.
+        
+ticket_auto_response:
+    title: Ticket Auto-Response
+    content: >
+        
+canned_response:
+    title: Canned Response
+    content: >
+        This will cause an email to go out from the Default Email Address (or
+        Department’s default if setting is enabled) with the Canned Response chosen
+        here included in the Email. The <span class='doc-desc-title'>New Ticket
+        Auto-Reply</span> Template in an Email Template Set will dictate how the
+        Canned Response is included in that Email. What Email Template Set is used
+        depends on what Template Set is assigned as Default, or to the relevant
+        Department. (To edit Canned Responses, see Staff Panel -> Knowledgebase ->
+        Canned Responses). (To edit the <span class='doc-desc-title'>New Ticket
+        Auto-Reply</span> <span class='doc-desc-title'>Template</span>, see 
+        
+department:
+    title: Department
+    content: >
+        
+priority:
+    title: Priority
+    content: >
+        
+sla_plan:
+    title: SLA Plan
+    content: >
+        
+auto_assign_to_:
+    title: Auto-Assign to…
+    content: >
+        
+admin_notes:
+    title: Admin Notes
+    content: >
+        These notes are only visible to those whose account type is ‘<span
+        class='doc-desc-title'>Admin</span>.’
+        
+add_filter_button_:
+    title: Add Filter (Button)
+    content: >
+        
+reset_button_:
+    title: Reset (Button)
+    content: >
+        
+cancel_button_:
+    title: Cancel (Button)
+    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/manage.addnew_help_topic.yaml b/include/i18n/en_US/help/tips/manage.addnew_help_topic.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..958ae0f72ad060262be13bf6a985fb81e3e7d4f3
--- /dev/null
+++ b/include/i18n/en_US/help/tips/manage.addnew_help_topic.yaml
@@ -0,0 +1,114 @@
+#
+# This is popup help messages for the Admin Panel -> Manage -> Add New Help Topic
+#
+# 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.
+#
+---
+help_topic_information:
+    title: Help Topic Information
+    content: >
+        Your Help Topics help guide what information is gathered from a Client and
+        how that Client is handled by your Company. The Help Topics are specific to
+        a Department and can include Custom Forms. 
+        
+topic:
+    title: Topic
+    content: >
+        Choose a Topic Label by which you want this Help Topic to be recognized.
+        
+status:
+    title: Status
+    content: >
+        If disabled, this Help Topic will not be able to be selected by Clients in
+        the Client Interface.
+        
+type:
+    title: Type
+    content: >
+        If a Topic is labelled as Private, it will only be available for Agents to
+        choose when an Agent opens a new Ticket under the Staff Panel.
+        
+parent_topic:
+    title: Parent Topic
+    content: >
+        Do you want the New Topic to be treated as a subtopic? If so, then choose a
+        Parent Topic under which your New Topic will belong.
+        
+new_ticket_options:
+    title: New Ticket Options
+    content: >
+        
+custom_form:
+    title: Custom Form
+    content: >
+        Custom Forms will help you acquire more specific information from Client’s
+        that are relevant to specific Departments and/or Help Topics. (To create a
+        Custom Form, see Admin Panel -> Manage -> Forms).
+        
+priority:
+    title: Priority
+    content: >
+        New Tickets created related to the New Topic will be labeled as having what
+        priority level?
+        
+department:
+    title: Department
+    content: >
+        If a Client chooses this New Topic as relevant to their situation, to what
+        Department do you want their Ticket to be routed?
+        
+sla_plan:
+    title: SLA Plan
+    content: >
+        Each Department has a default SLA plan for their Tickets. However, if your
+        New Topic is a special case requiring different time constraints, you can
+        override the Departments default SLA Plan by choosing an SLA Plan here. (To
+        create/edit SLA Plans, see Admin Plans -> Manage -> SLA Plans).
+        
+thank_you_page:
+    title: Thank-You Page
+    content: >
+        Choose the Thank-You Page to which a Client is directed after opening a
+        Ticket. (To Create/Edit your Thank-You Pages, see Admin Panel -> Manage ->
+        Pages).
+        
+auto_assign_to:
+    title: Auto-assign to…
+    content: >
+        You may optionally choose to what Agent or Team the Tickets characterized
+        by this New Topic will be sent. (To manage Teams, see Admin Panel -> Agent 
+        (Staff) Members -> Teams).
+        
+ticket_auto_response:
+    title: Ticket Auto-response
+    content: >
+        If enabled, this will prevent any Alert sent out to notify any Agent of the
+        New Ticket. Therefore, this overrides any setting of the Department to
+        which the Ticket belongs.
+        
+admin_notes:
+    title: Admin Notes
+    content: >
+        These notes are only visible to those whose account type is ‘<span
+        class='doc-desc-title'>Admin</span>.’
+        
+add_topic:
+    title: Add Topic
+    content: >
+        
+reset:
+    title: Reset
+    content: >
+        
+cancel:
+    title: Cancel
+    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/manage.addnew_page.yaml b/include/i18n/en_US/help/tips/manage.addnew_page.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..c00f9289f28a21f7857d7cb3ef451eaed83867fb
--- /dev/null
+++ b/include/i18n/en_US/help/tips/manage.addnew_page.yaml
@@ -0,0 +1,58 @@
+#
+# This is popup help messages for the Admin Panel -> Manage -> Add New Page
+#
+# 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.
+#
+---
+page_information:
+    title: Page Information
+    content: >
+        
+name:
+    title: Name
+    content: >
+        
+type:
+    title: Type
+    content: >
+        
+status:
+    title: Status
+    content: >
+        
+page_body:
+    title: Page Body
+    content: >
+        
+page_body_task_menu_:
+    title: Page Body (Task Menu)
+    content: >
+        Be sure to define what each icon’s function is.
+        
+admin_notes:
+    title: Admin Notes
+    content: >
+        These notes are only visible to those whose account type is ‘<span
+        class='doc-desc-title'>Admin</span>.’
+        
+add_page_button_:
+    title: Add Page (Button)
+    content: >
+        
+reset_button_:
+    title: Reset (Button)
+    content: >
+        
+cancel_button_:
+    title: Cancel (Button)
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/manage.addnew_sla_plan.yaml b/include/i18n/en_US/help/tips/manage.addnew_sla_plan.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..167b749f61392b0bbca4c68c10ccf5a30ecfcc92
--- /dev/null
+++ b/include/i18n/en_US/help/tips/manage.addnew_sla_plan.yaml
@@ -0,0 +1,53 @@
+#
+# This is popup help messages for the Admin Panel -> Manage -> Add New SLA Plan
+#
+# 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.
+#
+---
+name:
+    title: Name
+    content: >
+        Choose a name for this SLA Plan that will reflect its purpose or
+        specificity (e.g., exclusivity to a Department or Help Topic).
+        
+grace_period:
+    title: Grace Period
+    content: >
+        This is the how many hours pass by before the status of tickets with this
+        SLA Plan are rendered as Overdue.
+        
+status:
+    title: Status
+    content: >
+        
+priority_escalation:
+    title: Priority Escalation
+    content: >
+        If enabled, the priority level of Tickets will increase as the duration of
+        a Ticket’s status as Overdue increases. It is recommended to enable to help
+        your Agents prioritize their tickets properly.
+        
+transient:
+    title: Transient
+    content: >
+        If enabled, this will allow a SLA Plan’s restrictions to be overwritten
+        when a Ticket is transferred or its Help Topic is changed.
+        
+ticket_overdue_alerts:
+    title: Ticket Overdue Alerts
+    content: >
+        
+admin_notes:
+    title: Admin Notes
+    content: >
+        These notes are only visible to those whose account type is ‘<span
+        class='doc-desc-title'>Admin</span>.’
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/manage.api_keys.yaml b/include/i18n/en_US/help/tips/manage.api_keys.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7c28f068404d416e69600b029ad167957fde1d88
--- /dev/null
+++ b/include/i18n/en_US/help/tips/manage.api_keys.yaml
@@ -0,0 +1,42 @@
+#
+# This is popup help messages for the Admin Panel -> Manage -> API Keys
+#
+# 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.
+#
+---
+add_new_api_key:
+    title: Add New API Key
+    content: >
+        
+api_keys_table_:
+    title: API Keys (Table)
+    content: >
+        
+api_key:
+    title: API Key
+    content: >
+        
+ip_addr_:
+    title: IP Addr.
+    content: >
+        
+status:
+    title: Status
+    content: >
+        
+date_added:
+    title: Date Added
+    content: >
+        
+last_updated:
+    title: Last Updated
+    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/manage.help_topics.yaml b/include/i18n/en_US/help/tips/manage.help_topics.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5c9be069b560f1d237c79ae0d5e9005db93711ff
--- /dev/null
+++ b/include/i18n/en_US/help/tips/manage.help_topics.yaml
@@ -0,0 +1,27 @@
+#
+# This is popup help messages for the Admin Panel -> Manage -> Help Topics
+#
+# 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.
+#
+---
+help_topics_table_:
+    title: Help Topics (Table)
+    content: >
+        Your Help Topics help guide what information is gathered from a Client and
+        how that Client is handled by your Company. The Help Topics are specific to
+        a Department and can include Custom Forms. 
+        
+showing_help_topics:
+    title: Showing...Help Topics
+    content: >
+        Be sure to check the Page section below to ensure that there are not more
+        pages displaying existing Help Topics.
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/manage.pages.yaml b/include/i18n/en_US/help/tips/manage.pages.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..be991043532b64f41d494dd5ab05b8d2e9bb23af
--- /dev/null
+++ b/include/i18n/en_US/help/tips/manage.pages.yaml
@@ -0,0 +1,58 @@
+#
+# This is popup help messages for the Admin Panel -> Manage -> Pages
+#
+# 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.
+#
+---
+add_new_page:
+    title: Add New Page
+    content: >
+        
+site_pages_table_:
+    title: Site Pages (Table)
+    content: >
+        
+showing_:
+    title: Showing…
+    content: >
+        
+name:
+    title: Name
+    content: >
+        
+type:
+    title: Type
+    content: >
+        
+status:
+    title: Status
+    content: >
+        
+date_added:
+    title: Date Added
+    content: >
+        
+last_updated:
+    title: Last Updated
+    content: >
+        
+enable_button_:
+    title: Enable (Button)
+    content: >
+        
+disable_button_:
+    title: Disable (Button)
+    content: >
+        
+delete_button_:
+    title: Delete (Button)
+    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/manage.ticket_filters.yaml b/include/i18n/en_US/help/tips/manage.ticket_filters.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5a6ebb28d995be41884d4d778777155eac27570d
--- /dev/null
+++ b/include/i18n/en_US/help/tips/manage.ticket_filters.yaml
@@ -0,0 +1,66 @@
+#
+# This is popup help messages for the Admin Panel -> Manage -> Ticket Filters
+#
+# 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.
+#
+---
+ticket_filters_table_:
+    title: Ticket Filters (Table)
+    content: >
+        
+showing_filters:
+    title: Showing...Filters
+    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>
+        
+name:
+    title: Name
+    content: >
+        
+status:
+    title: Status
+    content: >
+        
+order:
+    title: Order
+    content: >
+        
+rules:
+    title: Rules
+    content: >
+        
+target:
+    title: Target
+    content: >
+        
+date_added:
+    title: Date Added
+    content: >
+        
+last_updated:
+    title: Last Updated
+    content: >
+        
+enable_button_:
+    title: Enable (Button)
+    content: >
+        
+disable_button_:
+    title: Disable (Button)
+    content: >
+        
+delete_button_:
+    title: Delete (Button)
+    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/settings.access.yaml b/include/i18n/en_US/help/tips/settings.access.yaml
index 911a4b34c3b665cdf1be6d3930344fc28ac5c520..260c79575d54f6849ee402856bd6c6e25595caf1 100644
--- a/include/i18n/en_US/help/tips/settings.access.yaml
+++ b/include/i18n/en_US/help/tips/settings.access.yaml
@@ -20,3 +20,49 @@ password_reset:
         Sets how often (in months) staff members will be required to change
         their password. If disabled (set to "No expiration"), passwords will
         not expire.
+
+password_expiration_policy:
+    title: Password Expiration Policy
+    content: >
+        Choose how often Agents will be required to change their password. If
+        disabled (i.e., <span class="doc-desc-opt">No Expiration</span>), passwords
+        will not expire.
+
+allow_password_resets:
+    title: Allow Password Resets
+    content: >
+        Would you like to enable the <span class="doc-desc-title">Forgot My
+        Password</span> link after 2 failed log-in attempts? If so, check the
+        checkbox.
+
+password_reset_window:
+    title: Password Reset Window
+    content: >
+        When a user (administrator, agent, or client) has requested a <span
+        class="doc-desc-title">Password Reset</span>, they are emailed a token that
+        will permit the reset to take place. This token however must have an
+        expiration. So, please choose the duration (in minutes) for which this
+        token would be valid.
+
+staff_session_timeout:
+    title: Staff Session Timeout
+    content: >
+        Choose the maximum idle time (in minutes) before an Agent is required to
+        log in again. If you would like to disable <span
+        class="doc-desc-title">Agent</span> <span class="doc-desc-title">Session
+        Timeouts,</span> enter 0 to <span class="doc-desc-opt">disable</span>.
+
+client_session_timeout:
+    title: Client Session Timeout
+    content: >
+        Choose the maximum idle time (in minutes) before a Client is required to
+        log in again. If you would like to disable <span
+        class="doc-desc-title">Client</span> <span class="doc-desc-title">Session
+        Timeouts,</span> enter 0 to <span class="doc-desc-opt">disable</span>.
+
+bind_staff_session_to_ip:
+    title: Bind Staff Session to IP
+    content: >
+        Enable this if you want the Agent to be remembered by their current IP
+        at the time of Log In.
+
diff --git a/include/i18n/en_US/help/tips/settings.alerts.yaml b/include/i18n/en_US/help/tips/settings.alerts.yaml
index c0532f1ac482f33efabdc2d0acb02b0284c68c56..6c7fedd9dae576ee178262196c40143ad1ff8b9a 100644
--- a/include/i18n/en_US/help/tips/settings.alerts.yaml
+++ b/include/i18n/en_US/help/tips/settings.alerts.yaml
@@ -1,5 +1,5 @@
 #
-# This is popup help messages for the Admin Panel -> Settings -> System page
+# This is popup help messages for the Account Panel ->
 #
 # Fields:
 # title - Shown in bold at the top of the popover window
@@ -13,12 +13,12 @@
 # must match the HTML #ids put into the page template.
 #
 ---
-new_ticket:
+new_ticket_alert:
     title: New Ticket Alert
     content: >
         <p>
-        Alert sent out to staff members when new tickets are created in the
-        system.
+        Pertains to alerts that are sent out when new tickets are created by
+        Clients.
         </p><p class="info-banner">
         <i class="icon-info-sign"></i>
         Staff members (department members) are not
@@ -28,50 +28,174 @@ new_ticket:
       - title: Default New Ticket Alert Template
         href: /scp/templates.php?default_for=ticket.alert
 
-new_message:
+status:
+    title: Status
+    content: >
+        You may choose to disable whether any notice of New Tickets are sent out at
+        all.
+
+new_message_alert:
     title: New Message Alert
     content: >
-        Alert sent out when a new message, from the user, is appended to an
-        existing ticket
+        Alert sent out when a New Message from the Client is appended to an
+        existing ticket.
     links:
       - title: Default New Message Alert Template
         href: /scp/templates.php?default_for=message.alert
 
-new_activity:
+status_2:
+    title: Status
+    content: >
+        You may disable this Alert.
+
+last_respondent:
+    title: Last Respondent
+    content: >
+        Choose whether you would like the last Agent to have communicated with the
+        Client to be Alerted of the Client’s reply.
+
+assigned_staff:
+    title: Assigned Staff
+    content: >
+        Choose whether you would like the Assigned Agent to receive an Alert of a
+        Client’s reply.
+
+department_manager:
+    title: Department Manager
+    content: >
+        If enabled, the Department Manager’s Inbox could be flooded unnecessarily
+        with Email Alerts.
+
+new_internal_note_alert:
     title: New Internal Note Alert
     content: >
-        Alert sent out when a new internal note is posted
+        Pertains to alerts that are sent out when a new <span
+        class="doc-desc-title">Internal Note</span> is recorded.
     links:
       - title: Default Ticket Activity Template
         href: /scp/templates.php?default_for=note.alert
 
-assign_alert:
-    title: Alert on Assignment
+last_respondent_2:
+    title: Last Respondent
     content: >
-        Alert sent out to staff on ticket assignment
+        If enabled, the last Agent to have communicated with the Client will
+        receive an Alert that an Agent has recorded a new Internal Note on a Ticket
+        with which they have been involved.
+
+assigned_staff_2:
+    title: Assigned Staff
+    content: >
+        If enabled, the last Agent assigned to the Ticket will receive an Alert
+        that an Agent has recorded a new Internal Note.
+
+department_manager_2:
+    title: Department Manager
+    content: >
+        If enabled, the Department Manager’s Inbox could be flooded unnecessarily
+        with Email Alerts.
+
+ticket_assignment_alert:
+    title: Ticket Assignment Alert
+    content: >
+        Pertains to alerts that are sent out to Agents when a ticket is assigned.
     links:
       - title: Default Ticket Assignment Alert Template
         href: /scp/templates.php?default_for=assigned.alert
 
-transfer_alert:
-    title: Alert on Transfer
+assigned_staff_3:
+    title: Assigned Staff
+    content: >
+        If enabled, the Agent being assigned to a Ticket will receive an Alert
+        notifying them of such.
+
+team_lead:
+    title: Team Lead
+    content: >
+        If enabled, if a Ticket is assigned to a Team, the Team Lead will be
+        alerted of the new Assigned Ticket. (To manage your Teams, see Admin Panel
+        -> Agent (Staff) Members -> Teams).
+
+team_members:
+    title: Team Members
+    content: >
+        If enabled, if a Ticket is assigned to a Team, the entire Team will be
+        alerted of the new Assigned Ticket. This may cause an unnecessary amount of
+        Email traffic and should be used with caution. (To manage your Teams, see
+        Admin Panel -> Agent (Staff) Members -> Teams).
+
+ticket_transfer_alert:
+    title: Ticket Transfer Alert
     content: >
-        Alert sent out to staff of the target department on ticket transfer
+        Pertains to alerts that are sent out to the target <span
+        class="doc-desc-title">department</span> when a ticket is transferred.
     links:
       - title: Default Ticket Transfer Alert Template
         href: /scp/templates.php?default_for=transfer.alert
 
-stale_alert:
-    title: Alert on Stale Ticket
+assigned_staff_team:
+    title: Assigned Staff/Team
+    content: >
+        If enabled, the new Agent/Team of the targeted Department will be alerted
+        of such.
+
+department_manager_3:
+    title: Department Manager
     content: >
-        Alert sent out when a ticket becomes overdue - admin email gets an
-        alert by default
+        If enabled, when a Ticket is transferred to a new Department, the Manager
+        of the targeted Department will be alerted of such.
+
+department_members:
+    title: Department Members
+    content: >
+        If enabled, the every member of the Targeted Department will receive an
+        Alert of the Ticket Transfer. This may cause an unnecessary amount of Email
+        traffic and should be used with caution.
+
+overdue_ticket_alert:
+    title: Overdue Ticket Alert
+    content: >
+        Pertains to alerts that are sent out when a ticket becomes overdue. The
+        <span class="doc-desc-title">Administrator</span> receives an alert by
+        default
     links:
       - title: Default Stale Ticket Alert Template
         href: /scp/templates.php?default_for=ticket.overdue
 
-meltdowns:
+assigned_staff_team_2:
+    title: Assigned Staff/Team
+    content: >
+        The Agent or Team that is assigned to the Ticket entering an Overdue status
+        will be alerted of such.
+
+department_manager_4:
+    title: Department Manager
+    content: >
+        The Manager of the Department whose Ticket enters an Overdue status will be
+        alerted.
+
+department_members_2:
+    title: Department Members
+    content: >
+        If enabled, the every member of the Department will receive an Alert of the
+        Overdue status of the Ticket. This may cause an unnecessary amount of Email
+        traffic and should be used with caution.
+
+system_alerts:
+    title: System Alerts
+    content: >
+        Pertains to alerts that are sent out when a <span
+        class="doc-desc-title">System Error</span> occurs. This is enabled by
+        default. Errors are sent to the system <span
+        class="doc-desc-title">Administrator</span> (%{config.admin_email}).
+
+system_errors:
     title: System Errors
     content: >
-        Enabled by default. Errors are sent to system admin email
-        (%{config.admin_email})
+        This is enabled by default. Alerts of System Errors are sent to the System
+        Administrator’s Email.
+
+excessive_login_attempts:
+    title: Excessive Login Attempts
+    content: >
+        If enabled, the System Administrator will be alerted when a Client or Agent
+        undergoes excessive failed login attempts.
diff --git a/include/i18n/en_US/help/tips/settings.autoresponder.yaml b/include/i18n/en_US/help/tips/settings.autoresponder.yaml
index 8f764de6f48595dfa281c26a3542b52106d8a9b4..9af653dbf04c69f9c57633326c137a3699e8679f 100644
--- a/include/i18n/en_US/help/tips/settings.autoresponder.yaml
+++ b/include/i18n/en_US/help/tips/settings.autoresponder.yaml
@@ -1,5 +1,5 @@
 #
-# This is popup help messages for the Admin Panel -> Settings -> System page
+# This is popup help messages for the Admin Panel -> Settings -> Autoresponder
 #
 # Fields:
 # title - Shown in bold at the top of the popover window
@@ -14,48 +14,47 @@
 #
 ---
 new_ticket:
-    title: New Ticket Auto-Response
+    title: New Ticket
     content: >
-        Autoresponse includes the ticket ID required to check status of the
-        ticket
+        Enable this if you want a confirmation message  sent to the Client
+        that the Help Desk has received their new ticket. The message sent to
+        the Client is customizable.
     links:
       - title: Default New Ticket Autoresponse Template
         href: /scp/templates.php?default_for=ticket.autoresp
-
-new_staff_ticket:
-    title: New Ticket by Staff Auto-Response
+        
+new_ticket_by_staff:
+    title: New Ticket by Staff
     content: >
-        Notice sent when staff creates a ticket on behalf of the user.
-        <em>Staff can override this when creating new tickets</em>
+        Notice sent when staff creates a ticket on behalf of the user. <em>Staff
+        can override this when creating new tickets.</em>
     links:
       - title: Default New Ticket by Staff Autoresponse Template
         href: /scp/templates.php?default_for=ticket.notice
-
-new_message:
-    title: New Message Confirmation
+        
+new_message_for_submitter:
+    title: New Message for Submitter
     content: >
-        Send a confirmation receipt to the message submitter when a new
-        message is appended to an existing ticket.
+        Confirmation notice sent when a new message is appended to an existing
+        ticket.
     links:
       - title: Default New Message Confirmation Template
         href: /scp/templates.php?default_for=message.autoresp
-
-collaborators:
-    title: New Activity Notice
+        
+new_message_for_participants:
+    title: New Message for Participants
     content: >
         Broadcast messages received from message submitter to all other
         participants on the ticket.
-
+        
 overlimit_notice:
     title: Overlimit Notice
     content: >
-        Send ticket denied notice to <offending> user when the <em>maximum
-        open tickets</em> limit is reached. Admin gets alerts on
-        <em>ALL</em> denials by default
+        Send ticket denied notice sent to user on limit violation. Admin gets
+        alerts on <em>all</em> denials by default.
     links:
       - title: Default Overlimit Notice Template
         href: /scp/templates.php?default_for=ticket.overlimit
 
       - title: Set <em>Maximum Open Tickets</em>
-        href: /scp/settings?t=tickets
-
+        href: /scp/settings?t=tickets
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/settings.email.yaml b/include/i18n/en_US/help/tips/settings.email.yaml
index ce58aa7999059ec07ade6244875616ed0ab8dc59..82376aa8c1f75df21a7b2bd6d9c5588864d7ab9f 100644
--- a/include/i18n/en_US/help/tips/settings.email.yaml
+++ b/include/i18n/en_US/help/tips/settings.email.yaml
@@ -1,5 +1,5 @@
 #
-# This is popup help messages for the Admin Panel -> Settings -> System page
+# This is popup help messages for the Admin Panel -> Settings -> Emails
 #
 # Fields:
 # title - Shown in bold at the top of the popover window
@@ -13,64 +13,100 @@
 # must match the HTML #ids put into the page template.
 #
 ---
-default_templates:
+default_email_templates:
     title: Default Email Templates
     content: >
-         Set of templates that will be utilized for Alerts &amp; Notices to
-         staff as well as Auto-Responses to clients during the actions in a
-         ticket’s life cycle. Templates can be created in Admin Panel &gt;
-         Emails &gt; Templates
-    links:
-      - title: Email Templates
-        href: /scp/templates.php
+        <span class="doc-desc-title">Templates</span> are used as <span
+        class="doc-desc-title">Auto-Responses</span> for various actions that can
+        take place during a  Ticket’s lifetime. <span
+        class="doc-desc-title">Alerts</span> are sent to Agents as assigned by
+        <span class="doc-desc-title">Department</span>, <span
+        class="doc-desc-title">Team</span>, <span class="doc-desc-title">Help
+        Topic</span> or <span class="doc-desc-title">Group</span>. Responses or
+        Replies are intended for the Client who created the Ticket.
 
-default_email:
+default_system_email:
     title: Default System Email
     content: >
-        Set the system email address that auto-responses that clients will
-        be shown emails are from if not set by Department
-    links:
-      - title: System Email Addresses
-        href: /scp/emails.php
+        Choose an Email Address from which <span
+        class="doc-desc-title">Auto-Responses</span> are sent to Clients. Note,
+        however, that if the Department to which a Ticket is assigned sets its own
+        Default Email Address, that Department Address will override what is set
+        here.
 
 default_alert_email:
     title: Default Alert Email
     content: >
-        Set the email address that Alerts &amp; Notices to staff will be
-        shown as received from if no default is set by Department (Admin
-        Panel &gt; Staff &gt; Department) or by Help Topic (Admin Panel &gt;
-        Manage &gt; Help Topic)
-    links:
-      - title: System Email Addresses
-        href: /scp/emails.php
+        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
+        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
+        class="doc-desc-title">Department</span> or <span
+        class="doc-desc-title">Help Topic</span> setting will override what is set
+        here.
 
-admin_email:
-    title: Administrative Contact
+admins_email_address:
+    title: Admin’s Email Address
     content: >
-        Set the address for the Helpdesk Administrator to receive notices of
-        the System Error Log as well as the New Ticket Alerts (if enabled at
-        Admin Panel &gt; Settings &gt; Alerts &amp; Notices &gt; New Ticket
-        Alert)
-    links:
-      - title: Alerts &amp; Notices
-        href: /scp/settings.php?t=alerts
+        Choose an Email Address from which notices of the <span
+        class="doc-desc-title">System Error Log</span> and <span
+        class="doc-desc-title">New Ticket Alerts</span> (if enabled) are sent to
+        the Helpdesk Administrator.
 
-# Incoming emails section
-incoming_email:
-    title: Incoming Email Settings
+incoming_emails:
+    title: Incoming Emails
     content: >
-        Allow IMAP/POP polling once you have set up the information in
-        emails section of Admin Panel. You can also edit the reply separator
-        text.<br/><br/>
-        <em>For mail polling to work you must set an external cron job or
-        enable auto-cron polling</em>
+        Allow IMAP/POP polling once you have set up the information in emails
+        section of Admin Panel. You can also edit the reply separator text.
 
-enable_email_poll:
-    title: Enable Email Polling
+
+email_polling:
+    title: Email Polling
+    content: >
+        Allow IMAP/POP polling once you have set up the information in emails
+        section of Admin Panel. You can also edit the reply separator text.
+
+strip_quoted_reply:
+    title: 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.
+
+reply_separator_tag:
+    title: Reply Separator Tag
     content: >
-        Allow IMAP/POP polling once you have set up the information in
-        emails section of Admin Panel. You can also edit the reply separator
-        text
+        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
+        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.
+
+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>
+         <em>Collaborators can always be added manually by staff members when
+        viewing a ticket.</em>
+
+default_outgoing_email:
+    title: Default Outgoing Email
+    content: >
+        <span class="doc-desc-title">Default Outgoing Email</span> only applies to
+        outgoing emails without SMTP setting.
 
 enable_autocron_poll:
     title: Poll Email using Auto-cron
@@ -80,20 +116,3 @@ enable_autocron_poll:
         As admin and staff members interact with the system, the system will
         periodically run cleanup routines called the auto-cron. This setting
         enables fetching email during this cleanup.
-
-use_email_priority:
-    title: Honor Email Priority
-    content: >
-        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.
-
-add_email_collabs:
-    title: Email Collaborators
-    content: >
-        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.kb.yaml b/include/i18n/en_US/help/tips/settings.kb.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..38390b52adf541a7152149b08399d58ddd4c70c0
--- /dev/null
+++ b/include/i18n/en_US/help/tips/settings.kb.yaml
@@ -0,0 +1,31 @@
+#
+# This is popup help messages for the Admin Panel -> Settings -> Knowledgebase
+#
+# 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.
+#
+---
+knowledge_base_settings:
+    title: Knowledge Base Settings
+    content: >
+        
+knowledge_base_status:
+    title: Knowledge Base Status
+    content: >
+        To edit the content of your Knowledge Base, see Agent (Staff) Panel ->
+        Knowledgebase.
+        
+canned_responses:
+    title: Canned Responses
+    content: >
+        If enabled, this will permit the use of Canned Responses within Ticket
+        Replies. (To add or edit Canned Responses, see Agent (Staff) Panel ->
+        Knowledgebase).
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/settings.pages.yaml b/include/i18n/en_US/help/tips/settings.pages.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..6de3e6b148963f6f6a1971d93ec12026912518a9
--- /dev/null
+++ b/include/i18n/en_US/help/tips/settings.pages.yaml
@@ -0,0 +1,67 @@
+#
+# This is popup help messages for the Account Panel -> 
+#
+# 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.
+#
+---
+company_information:
+    title: Company Information
+    content: >
+        This refers to the company or organization that will benefit from
+        osTicket’s software and its support staff. The information here will appear
+        in email signatures (i.e., the footer) when tickets are responded to by
+        agents.
+        
+phone_number:
+    title: Phone Number
+    content: >
+        Just ask, what number would the Yellow Pages give me?
+        
+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)?
+        
+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.
+        
+default_thank_you_page:
+    title: Default Thank-You Page
+    content: >
+        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.
+        
+logos:
+    title: Logos
+    content: >
+        You may customize the <span class="doc-desc-title">Logo</span> that will be
+        displayed to the Client in the Client Portal (i.e., your Support Site). 
+        
+upload_a_new_logo:
+    title: Upload a new logo
+    content: >
+        Choose an image in the .gif, .jpg or .png formats. We will proportionally
+        resize the display of your image. We will not however resize the image’s
+        data. Therefore, to speed load times, it is recommended that you keep your
+        image close to the default image (817x170).
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/settings.system.yaml b/include/i18n/en_US/help/tips/settings.system.yaml
index 60e336b73470394cc7f7821317dd883e80d2006d..cb718d87e2c60b01f4bc243164acb17afc667064 100644
--- a/include/i18n/en_US/help/tips/settings.system.yaml
+++ b/include/i18n/en_US/help/tips/settings.system.yaml
@@ -1,5 +1,5 @@
 #
-# This is popup help messages for the Admin Panel -> Settings -> System page
+# This is popup help messages for the Admin Panel -> Settings -> System
 #
 # Fields:
 # title - Shown in bold at the top of the popover window
@@ -16,53 +16,56 @@
 helpdesk_status:
     title: Helpdesk Status
     content: >
-        Enables the client portal and the staff interface. If this option is
-        disabled, then only staff marked as <b>Admins</b> will be able to
-        access the helpdesk.
+        If the status is changed to Offline, the client interface will be disabled.
+        This does not however affect any normal Agent interaction with the Agent
+        Panel.
 
 helpdesk_url:
     title: Helpdesk URL
     content: >
-        This URL is the base of your osTicket installation. It is used in
-        email communication to direct end users back to your helpdesk.
+        This URL is the base of your osTicket installation. It is used in email
+        communication to direct end-users back to your helpdesk.
 
-helpdesk_name:
-    title: Helpdesk Name
+helpdesk_name_title:
+    title: Helpdesk Name/Title
     content: >
-        Name that will appear in the browser tab when at your client
-        interface. If your help desk page is bookmarked, this will be the
-        title/name of the site page
+        This appears in the browser tab when a <span class="doc-desc-title">client
+        </span> goes to your help desk. If your help desk page is bookmarked (i.e.,
+        in your favorites), this will be the title/name of the site page.
 
-default_dept:
+default_department:
     title: Default Department
     content: >
-        Determines the default department for tickets submitted that do not
-        have a department auto-assigned by help topic or incoming email
-    links:
-      - title: Manage Departments
-        href: /scp/departments.php
+        Determines the default <span class="doc-desc-title">department</span> for
+        tickets submitted that do not have a department auto-assigned by help topic
+        or incoming email.
 
-page_size:
+default_page_size:
     title: Default Page Size
     content: >
-        This determines the number of tickets per page on the ticket view
-        (Staff Panel &gt; Tickets). This can be defined in the
-        "My Preferences" for each staff member
+        How many Tickets would you like to see per page in the Ticket Tables in the
+        Staff Panel? Each Agent can also customize this number for their own
+        account under <span class="doc-desc-title">My Preferences</span>.
 
-log_level:
+default_log_level:
     title: Default Log Level
     content: >
-        Determines the level of issues that will be saved in the system log
-        including, excess log-ins, denied tickets, etc.
+        Determines to what minimum level of issues that will be recorded in the
+        <span class="doc-desc-title">system log</span>. <span
+        class="doc-desc-opt">Debug</span> represents the least severity, and <span
+        class="doc-desc-opt">Error</span> represents the greatest severity. So, if
+        you want to see all issues in the <span class="doc-desc-title">System
+        Logs</span>, choose <span class="doc-desc-opt">Debug</span>.
 
-log_purge:
+purge_logs:
     title: Purge Logs
     content: >
-        Length, in months, you would like to keep the system log activity
-        for viewing on the System Logs page.
+        How long would you like to store the <span class="doc-desc-title">System
+        Logs</span> until they are deleted? You may also choose to <span
+        class="doc-desc-opt">Never Purge Logs</span>.
 
-name_format:
-    title: Default Name Format
+default_name_formatting:
+    title: Default Name Formatting
     content: >
         Formatting technique used to format names throughout the system.
         Email templates will use the format for names if no other format is
@@ -71,11 +74,15 @@ name_format:
 # Date and time options
 date_and_time:
     title: Localized Date Formats
+        You may choose from various formats in which names throughout the system
+        will be displayed. This is also the format that will be used by Emails if
+        no other format is established in the <span class="doc-desc-title">Email
+        Template</span>.
+
+date_time_options:
+    title: Date &amp; Time Options
     content: >
-        Set up the format for the client’s Date &amp; Time.  To set time/date
-        for staff, go to Admin Panel &gt; Staff &gt; select staff profile to edit
-    links:
-      - title: PHP date() formats
-        href: "http://php.net/date"
-      - title: Your preferences
-        href: /scp/profile.php
+        The following settings will alter the Date &amp; Time settings Clients. You can
+        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.
diff --git a/include/i18n/en_US/help/tips/settings.ticket.yaml b/include/i18n/en_US/help/tips/settings.ticket.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a2d2b7caddd6eaa9776e128c22a927d66b236029
--- /dev/null
+++ b/include/i18n/en_US/help/tips/settings.ticket.yaml
@@ -0,0 +1,151 @@
+#
+# This is popup help messages for the Admin Panel -> Settings -> Tickets
+#
+# 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.
+#
+---
+global_ticket_settings_options:
+    title: Global Ticket Settings &amp; 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).
+        
+ticket_ids:
+    title: Ticket IDs
+    content: >
+        Choose between Random (Recommended) or Sequential numbers for tickets.
+        
+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).
+        
+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 
+        
+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.
+        
+ticket_auto_lock_priority:
+    title: Ticket Auto-lock Priority
+    content: >
+        Minutes to lock a ticket on activity - enter 0 to disable locking
+        
+email_ticket_priority:
+    title: Email Ticket Priority
+    content: >
+        Use email priority assigned by addressee’s mail service
+        
+show_related_tickets:
+    title: Show Related Tickets
+    content: >
+        Show all related tickets on user login - otherwise access is restricted to
+        one ticket view per login
+        
+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. If you are using osTicket as a
+        SupportSystem.com customer, you do not need to worry about installing
+        GDLib. We have everything set up for you. Just enable CAPTCHA!  
+        
+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.
+        
+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. 
+        
+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. 
+        
+staff_identity_masking:
+    title: Staff Identity Masking
+    content: >
+        If enabled, this will hide the Agent’s name from the Client during any
+        communication.
+        
+enable_html_ticket_thread:
+    title: Enable HTML Ticket Thread
+    content: >
+        If enabled, this will permit the use of rich text formatting between
+        Clients and Agents and Auto-Response emails. 
+        
+attachments:
+    title: Attachments
+    content: >
+        
+allow_attachments:
+    title: Allow Attachments
+    content: >
+        
+emailed_api_attachments:
+    title: Emailed/API Attachments
+    content: >
+        
+online_web_attachments:
+    title: Online/Web Attachments
+    content: >
+        
+max_user_file_uploads:
+    title: Max. User File Uploads
+    content: >
+        
+max_staff_file_uploads:
+    title: Max. Staff File Uploads
+    content: >
+        
+maximum_file_size:
+    title: Maximum File Size
+    content: >
+        
+ticket_response_files:
+    title: Ticket Response Files
+    content: >
+        If enabled, any attachments an Agent may attach to a Ticket response will
+        be also included in the Client’s email.
+        
+accepted_file_types:
+    title: Accepted File Types
+    content: >
+        
+_textarea_:
+    title: (Textarea)
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/staff.addnew_department.yaml b/include/i18n/en_US/help/tips/staff.addnew_department.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..572e4c050eab87c3a11469b179b9040cc60b2bd4
--- /dev/null
+++ b/include/i18n/en_US/help/tips/staff.addnew_department.yaml
@@ -0,0 +1,117 @@
+#
+# This is popup help messages for the Admin Panel -> Staff -> Add New Department -> Department Form
+#
+# 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.
+#
+---
+add_new_department:
+    title: Add New Department
+    content: >
+        
+department_information:
+    title: Department Information
+    content: >
+        
+name:
+    title: Name
+    content: >
+        
+type:
+    title: Type
+    content: >
+        Select Private if the Department will only be pertinent to matters among
+        other Agents. Additionally, when labelled as Private, the Email Signature
+        will not display in replies.
+        
+email:
+    title: Email
+    content: >
+        Email Address assigned to this Department. When Tickets are assigned to
+        this Department, for example, it is this Email Address from whom the Client
+        will receive an Auto-Response Email. 
+        
+template:
+    title: Template
+    content: >
+        Template Set used for Auto-Responses, Alerts &amp; Notices for all Tickets
+        associated with this Department. 
+        
+sla:
+    title: SLA
+    content: >
+        Service Level Agreement  for all tickets transferred to Department or
+        auto-assigned by Help Topic. (To create or edit a SLA Plan, see Admin Panel
+        -> Manage -> SLA Plans).
+        
+group_membership:
+    title: Group Membership
+    content: >
+        You may optionally choose to extend membership access to Groups (to whom
+        Alerts and Notices will be sent). (To edit Groups, see Admin Panel ->
+        Agents (Staff) -> Groups).
+        
+auto_response_settings:
+    title: Auto-Response Settings
+    content: >
+        This allows you to disable New Ticket Auto-Response to Clients and/or New
+        Message Auto-Response to users when creating a ticket in this department. 
+        
+new_ticket:
+    title: New Ticket
+    content: >
+        Click the checkbox if do not want an Email automatically sent to the Client
+        when a New Ticket is Opened.
+        
+new_message:
+    title: New Message
+    content: >
+        Click the checkbox if do not want an Email automatically sent when a New
+        Message is received.
+        
+auto_response_email:
+    title: Auto Response Email
+    content: >
+        If you would like Department Email to send Auto-Responses from a different
+        Address from that noted above, then choose the differing Email Address
+        here. 
+        
+department_access:
+    title: Department Access
+    content: >
+        Department Manager and Primary Members will always have access independent
+        of group selection or assignment. To commission an Agent as a Department
+        Manager, you must first add that Agent to the Department by editing that
+        Agent’s Account. (To edit an Agent’s Account, see Admin Panel -> Agent 
+        (Staff) Members -> Choose the Agent to Edit).
+        
+department_signature:
+    title: Department Signature
+    content: >
+        Signature is made available as a choice, for Public Departments, on Ticket
+        Reply. What you create here will be an optional Signature that perhaps
+        appears at the end of the Agent’s 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_department_button_:
+    title: Create Department (Button)
+    content: >
+        
+reset_button_:
+    title: Reset (Button)
+    content: >
+        
+cancel_button_:
+    title: Cancel (Button)
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/staff.addnew_groups.yaml b/include/i18n/en_US/help/tips/staff.addnew_groups.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..de52f2b8878e4f0204ad73fb9bc138d60c0b000e
--- /dev/null
+++ b/include/i18n/en_US/help/tips/staff.addnew_groups.yaml
@@ -0,0 +1,105 @@
+#
+# This is popup help messages for the Admin Panel -> Staff -> Add New Group  -> User Group Form
+#
+# 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.
+#
+---
+add_new_group:
+    title: Add New Group
+    content: >
+        
+group_information:
+    title: Group Information
+    content: >
+        
+name:
+    title: Name
+    content: >
+        
+status:
+    title: Status
+    content: >
+        
+group_permissions:
+    title: Group Permissions
+    content: >
+        
+can_create_tickets:
+    title: Can Create Tickets
+    content: >
+        
+can_edit_tickets:
+    title: Can Edit Tickets
+    content: >
+        
+can_post_reply:
+    title: Can Post Reply
+    content: >
+        
+can_close_tickets:
+    title: Can Close Tickets
+    content: >
+        
+can_assign_tickets:
+    title: Can Assign Tickets
+    content: >
+        
+can_transfer_tickets:
+    title: Can Transfer Tickets
+    content: >
+        
+can_delete_tickets:
+    title: Can Delete Tickets
+    content: >
+        
+can_ban_emails:
+    title: Can Ban Emails
+    content: >
+        
+can_manage_premade:
+    title: Can Manage Premade
+    content: >
+        
+can_manage_faq:
+    title: Can Manage FAQ
+    content: >
+        
+can_view_staff_stats_:
+    title: Can View Staff Stats.
+    content: >
+        
+department_access:
+    title: Department Access
+    content: >
+        
+support:
+    title: Support
+    content: >
+        
+admin_notes:
+    title: Admin Notes
+    content: >
+        These notes are only visible to those whose account type is ‘<span
+        class='doc-desc-title'>Admin</span>.’
+        
+create_group_button_:
+    title: Create Group (Button)
+    content: >
+        
+reset_button_:
+    title: Reset (Button)
+    content: >
+        
+cancel_button_:
+    title: Cancel (Button)
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/staff.addnew_staff.yaml b/include/i18n/en_US/help/tips/staff.addnew_staff.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..759f4762064ca3ddad8753725aa7e93f9507a746
--- /dev/null
+++ b/include/i18n/en_US/help/tips/staff.addnew_staff.yaml
@@ -0,0 +1,213 @@
+#
+# This is popup help messages for the Admin Panel -> Staff -> Add Staff Form
+#
+# 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.
+#
+---
+add_new_agent:
+    title: Add New Agent
+    content: >
+        This form is accessed from the Add New Staff hyperlink (To access this
+        form, see Admin Panel -> Staff -> Staff Members).
+        
+agent_staff_information:
+    title: Agent (Staff) Information
+    content: >
+        <span class='doc-desc-title'>Username</span>, <span
+        class='doc-desc-title'>First</span> &amp; <span class='doc-desc-title'>Last
+        Name</span>, <span class='doc-desc-title'>Email Address</span> (Required).
+        Optionally, <span class='doc-desc-title'>phone numbers</span> can be set
+        here also.
+        
+username:
+    title: Username
+    content: >
+        Please choose an <span class='doc-desc-title'>agent</span> <span
+        class='doc-desc-title'>username</span> that is unique to your osTicket
+        setup.
+        
+first_name:
+    title: First Name
+    content: >
+        The full name will generally be visible to any <span
+        class='doc-desc-title'>agent</span>/<span
+        class='doc-desc-title'>administrator</span> you create on your osTicket
+        setup. However, you can choose to hide all <span
+        class='doc-desc-title'>agent</span> names inside of ticket responses (Admin
+        Panel -> Settings -> Tickets -> Hide staff’s name on responses).
+        Establishing a privacy policy is the responsibility of primary <span
+        class='doc-desc-title'>administrator</span> of an osTicket setup. To view
+        SupportSystem.com’s privacy policy, see here 
+        (http://supportsystem.com/privacy).
+        
+last_name:
+    title: Last Name
+    content: >
+        The full name will generally be visible to any <span
+        class='doc-desc-title'>agent</span>/<span
+        class='doc-desc-title'>administrator</span> you create on your osTicket
+        setup. However, you can choose to hide all <span
+        class='doc-desc-title'>agent</span> names inside of ticket responses (Admin
+        Panel -> Settings -> Tickets -> Hide staff’s name on responses).
+        Establishing a privacy policy is the responsibility of the primary
+        administrator of an osTicket setup. To view  SupportSystem.com’s privacy
+        policy, see here (http://supportsystem.com/privacy).
+        
+email_address:
+    title: Email Address
+    content: >
+        This is the Agent’s email that will receive relevant notifications to that
+        Agent.
+        
+phone_number_mobile_number:
+    title: Phone Number/Mobile Number
+    content: >
+        
+mobile_number:
+    title: Mobile Number
+    content: >
+        
+account_password:
+    title: Account Password
+    content: >
+        You, as an <span class='doc-desc-title'>administrator</span>, may change an
+        Agent’s Password. You may optionally require the Agent to set their own
+        Password on next login.
+        
+password:
+    title: Password
+    content: >
+        
+confirm_password:
+    title: Confirm Password
+    content: >
+        
+forced_password_change:
+    title: Forced Password Change
+    content: >
+        Enable this if you would like to force the new Agent to create their own
+        password that would be more memorable to him/her (recommended).
+        
+agent_s_signature:
+    title: Agent’s Signature
+    content: >
+        What you create here will be an optional signature that perhaps appears at
+        the end of the agent’s 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 ).
+        
+account_status_settings:
+    title: Account Status &amp; Settings
+    content: >
+        Activate or lock an agent’s account, assign agent to a group and/or
+        department, specify the agent’s time zone, limit agent’s access to only
+        assigned tickets &amp; place on vacation when agent is out.
+        
+account_status:
+    title: Account Status
+    content: >
+        If you change the <span class='doc-desc-title'>agent</span>’s status to
+        Locked, then he/she will not be able to login. If you change the <span
+        class='doc-desc-title'>agent</span>’s status to Vacation Mode, the agent
+        will be able to login but will not receive any of his normal notifications.
+        Also, he will not be able to have tickets assigned to him.  
+        
+assigned_group:
+    title: Assigned Group
+    content: >
+        The Group that you choose in which this <span
+        class='doc-desc-title'>agent</span> will belong will dictate what level of
+        control the agent has within your osTicket setup. The difference between
+        Teams and Groups is that Groups will dictate level of control and a Team is
+        simply a collection of users with a common purpose (To add/edit groups and
+        their controls,  see  Admin Panel -> Agents [Old: Staff] -> Groups).
+        
+primary_department:
+    title: Primary Department
+    content: >
+        Choose the department in which you would like this Agent to be primarily
+        active. This is necessary if you wish to commission this <span
+        class='doc-desc-title'>Agent</span> as the <span
+        class='doc-desc-title'>Department Manager</span>. (To commission an Agent
+        as Department Manager, see Admin Panel -> Staff -> Departments).
+        
+time_zone:
+    title: Time Zone
+    content: >
+        
+daylight_saving:
+    title: Daylight Saving
+    content: >
+        Enable this feature if you would like Daylight Savings to automatically
+        come into play for this Agent’s timestamp.
+        
+limited_access:
+    title: Limited Access
+    content: >
+        Would you like to limit this <span class='doc-desc-title'>Agent</span>’s
+        access to only those tickets which he/she is assigned?
+        
+directory_listing:
+    title: Directory Listing
+    content: >
+        Would you like this <span class='doc-desc-title'>Agent</span> to be listed
+        in the <span class='doc-desc-title'>Agent Directory</span>? (To visit the
+        <span class='doc-desc-title'>Agent Directory</span>, see Agent (Staff)
+        Panel -> Dashboard -> Agent (Staff) Directory).
+        
+vacation_mode:
+    title: Vacation Mode
+    content: >
+        If you change the <span class='doc-desc-title'>agent</span>’s status to
+        Vacation Mode, the agent will be able to login but will not receive any of
+        his normal notifications. Also, he will not be able to have tickets
+        assigned to him. 
+        
+administrative_roles:
+    title: Administrative Roles
+    content: >
+        All active <span class='doc-desc-title'>agents</span> have access to the
+        <span class='doc-desc-title'>Staff Panel</span> by default.
+        
+account_administrator:
+    title: Account Administrator
+    content: >
+        Will this <span class='doc-desc-title'>Agent</span> need to manage other
+        <span class='doc-desc-title'>agents</span>, <span
+        class='doc-desc-title'>account settings</span> and/or <span
+        class='doc-desc-title'>billing information</span>.
+        
+helpdesk_administrator:
+    title: Helpdesk Administrator
+    content: >
+        Ability to manage <span class='doc-desc-title'>helpdesk</span> settings and
+        staff's access
+        
+admin_notes:
+    title: Admin Notes
+    content: >
+        These are notes about the agent whose account you are currently editing.
+        But, don’t worry! These notes are only visible to those whose account type
+        is ‘<span class='doc-desc-title'>Admin</span>.’
+        
+add_agent_button_:
+    title: Add Agent (Button)
+    content: >
+        
+reset_button_:
+    title: Reset (Button)
+    content: >
+        
+cancel_button_:
+    title: Cancel (Button)
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/staff.agents.yaml b/include/i18n/en_US/help/tips/staff.agents.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e53020c3ee0790244dcb8bdc95ff8762a28a28b4
--- /dev/null
+++ b/include/i18n/en_US/help/tips/staff.agents.yaml
@@ -0,0 +1,51 @@
+#
+# This is popup help messages for the Account Panel -> Agents -> Agents
+#
+# 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.
+#
+---
+add_new_agent:
+    title: Add New Agent
+    content: >
+        
+agents_table_:
+    title: Agents (Table)
+    content: >
+        
+apply_filtering_criteria_dropdown_fields_apply_button_:
+    title: Apply Filtering Criteria (Dropdown Fields &amp; Apply Button)
+    content: >
+        
+showing_:
+    title: Showing…
+    content: >
+        
+name:
+    title: Name
+    content: >
+        
+username:
+    title: Username
+    content: >
+        
+status:
+    title: Status
+    content: >
+        
+created:
+    title: Created
+    content: >
+        
+last_login:
+    title: Last Login
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/staff.departments.yaml b/include/i18n/en_US/help/tips/staff.departments.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..39b76c12848dc4ebb2a06eb4451a7610e06acb14
--- /dev/null
+++ b/include/i18n/en_US/help/tips/staff.departments.yaml
@@ -0,0 +1,53 @@
+#
+# This is popup help messages for the Admin Panel -> Staff -> Departments
+#
+# 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.
+#
+---
+department_table_:
+    title: Department (Table)
+    content: >
+        
+showing_department:
+    title: Showing...department
+    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'>Departments.</span>
+        
+name:
+    title: Name
+    content: >
+        
+type:
+    title: Type
+    content: >
+        If the Department’s Type is Private, then that Department only handles
+        matters pertinent among other Agents.
+        
+users:
+    title: Users
+    content: >
+        
+email_address:
+    title: Email Address
+    content: >
+        
+dept_manager:
+    title: Dept. Manager
+    content: >
+        You may commission an Agent as a Department Manager by first adding that
+        Agent to the Department, and then choose that Agent as Manager by editing
+        the Department. (To add an Agent to a Department, see Admin Panel -> Staff
+        -> Staff Members; Select the Agent whose account you would like to edit. To
+        commission an Agent as a Department Manager, simply click the Department
+        name below that you would like to edit). 
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/staff.edit_staff_account_form.yaml b/include/i18n/en_US/help/tips/staff.edit_staff_account_form.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3883559c8c7ed013d6925b5e443f2b89b0fce13d
--- /dev/null
+++ b/include/i18n/en_US/help/tips/staff.edit_staff_account_form.yaml
@@ -0,0 +1,27 @@
+#
+# This is popup help messages for the Admin Panel -> Staff -> Edit Staff Account Form
+#
+# 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.
+#
+---
+update_staff:
+    title: Update Staff
+    content: >
+        This form is accessed by clicking the Username of an agent in the Agent 
+        (Staff) Members Table (To get here, see Admin Panel -> Staff -> Staff
+        Members).
+        
+assigned_teams:
+    title: Assigned Teams
+    content: >
+        Assign agent to as many teams as necessary.
+        
diff --git a/include/i18n/en_US/help/tips/staff.groups.yaml b/include/i18n/en_US/help/tips/staff.groups.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a7129facccfdbb071ccb734affe639056ba5401c
--- /dev/null
+++ b/include/i18n/en_US/help/tips/staff.groups.yaml
@@ -0,0 +1,63 @@
+#
+# This is popup help messages for the Admin Panel -> Staff -> Groups
+#
+# 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.
+#
+---
+add_new_group:
+    title: Add New Group
+    content: >
+        
+user_groups_table_:
+    title: User Groups (Table)
+    content: >
+        
+showing_groups:
+    title: Showing...groups
+    content: >
+        
+group_name:
+    title: Group Name
+    content: >
+        
+status:
+    title: Status
+    content: >
+        
+members:
+    title: Members
+    content: >
+        
+departments:
+    title: Departments
+    content: >
+        
+created_on:
+    title: Created On
+    content: >
+        
+last_updated:
+    title: Last Updated
+    content: >
+        
+enable_button_:
+    title: Enable (Button)
+    content: >
+        
+disable_button_:
+    title: Disable (Button)
+    content: >
+        
+delete_button_:
+    title: Delete (Button)
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/staff.staff_members.yaml b/include/i18n/en_US/help/tips/staff.staff_members.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..41de4e09a93538052f1c502d737a27c418ad1203
--- /dev/null
+++ b/include/i18n/en_US/help/tips/staff.staff_members.yaml
@@ -0,0 +1,98 @@
+#
+# This is popup help messages for the Admin Panel -> Staff -> Staff Members
+#
+# 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.
+#
+---
+add_new_staff:
+    title: Add New Staff
+    content: >
+        
+staff_members_table_:
+    title: Staff Members (Table)
+    content: >
+        The following table displays the results of the filter above. If not 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.  
+        
+apply_filtering_criteria_dropdown_fields_apply_button_:
+    title: Apply Filtering Criteria (Dropdown Fields &amp; Apply Button)
+    content: >
+        You may cause the <span class='doc-desc-title'>Agent (</span>Staff<span
+        class='doc-desc-title'>) Members</span> table to display only those <span
+        class='doc-desc-title'>Agents</span> that are relevant to your current
+        interests related to <span class='doc-desc-title'>Departments</span>, <span
+        class='doc-desc-title'>Groups</span>, or <span
+        class='doc-desc-title'>teams</span>.
+        
+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>
+        
+_checkbox_column_:
+    title: (Checkbox Column)
+    content: >
+        By choosing a checkbox next to the name of the <span
+        class='doc-desc-title'>Agent</span>(s), you may alter the <span
+        class='doc-desc-title'>Account Status</span> to either Locked or Enabled.
+        If you change the <span class='doc-desc-title'>agent</span>’s status to
+        Locked, then he/she will not be able to login.
+        
+name:
+    title: Name
+    content: >
+        
+username:
+    title: Username
+    content: >
+        
+status:
+    title: Status
+    content: >
+        This will display whether the <span class='doc-desc-title'>Agent</span> is
+        Locked, Active, or Active (Vacation).
+        
+group:
+    title: Group
+    content: >
+        
+department:
+    title: Department
+    content: >
+        
+created:
+    title: Created
+    content: >
+        
+last_login:
+    title: Last Login
+    content: >
+        
+enable_button_:
+    title: Enable (Button)
+    content: >
+        If you change the <span class='doc-desc-title'>agent</span>’s status to
+        Enabled, then all normal account settings established for that <span
+        class='doc-desc-title'>Agent</span> will resume.
+        
+lock_button_:
+    title: Lock (Button)
+    content: >
+        If you change the <span class='doc-desc-title'>agent</span>’s status to
+        Locked, then he/she will not be able to login.
+        
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/staff.team_form.yaml b/include/i18n/en_US/help/tips/staff.team_form.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f129a96522131c3981deaef1005b69ae1d7dacdd
--- /dev/null
+++ b/include/i18n/en_US/help/tips/staff.team_form.yaml
@@ -0,0 +1,56 @@
+#
+# This is popup help messages for the Admin Panel -> Staff ->  Team Form
+#
+# 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.
+#
+---
+add_new_team:
+    title: Add New Team
+    content: >
+        
+team_information:
+    title: Team Information
+    content: >
+        
+name:
+    title: Name
+    content: >
+        
+status:
+    title: Status
+    content: >
+        
+team_lead:
+    title: Team Lead
+    content: >
+        
+assignment_alerts:
+    title: Assignment Alerts
+    content: >
+        
+admin_notes:
+    title: Admin Notes
+    content: >
+        These notes are only visible to those whose account type is ‘<span
+        class='doc-desc-title'>Admin</span>.’
+        
+create_team_button_:
+    title: Create Team (Button)
+    content: >
+        
+reset_button_:
+    title: Reset (Button)
+    content: >
+        
+cancel_button_:
+    title: Cancel (Button)
+    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/staff.teams.yaml b/include/i18n/en_US/help/tips/staff.teams.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..72202c7ca6b4037efd756694ccb0d1bd4f36009d
--- /dev/null
+++ b/include/i18n/en_US/help/tips/staff.teams.yaml
@@ -0,0 +1,62 @@
+#
+# This is popup help messages for the Admin Panel -> Staff -> Teams
+#
+# 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.
+#
+---
+add_new_team:
+    title: Add New Team
+    content: >
+        
+teams_table_:
+    title: Teams (Table)
+    content: >
+        
+showing_teams:
+    title: Showing...teams
+    content: >
+        
+team_name:
+    title: Team Name
+    content: >
+        
+status:
+    title: Status
+    content: >
+        
+members:
+    title: Members
+    content: >
+        
+team_lead:
+    title: Team Lead
+    content: >
+        
+created:
+    title: Created
+    content: >
+        
+last_updated:
+    title: Last Updated
+    content: >
+        
+enable_button_:
+    title: Enable (Button)
+    content: >
+        
+disable_button_:
+    title: Disable (Button)
+    content: >
+        
+delete_button_:
+    title: Delete (Button)
+    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/tickets.advanced_search.yaml b/include/i18n/en_US/help/tips/tickets.advanced_search.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..8524a136da0003c1b298ff84faa4dc3c1f60343f
--- /dev/null
+++ b/include/i18n/en_US/help/tips/tickets.advanced_search.yaml
@@ -0,0 +1,59 @@
+#
+# This is popup help messages for the Staff Panel -> Tickets -> Advanced Search Prompt
+#
+# 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.
+#
+---
+keyword:
+    title: Keyword
+    content: >
+        
+status:
+    title: Status
+    content: >
+        
+dept_:
+    title: Dept.
+    content: >
+        
+assigned_to_:
+    title: Assigned To...
+    content: >
+        
+closed_by_:
+    title: Closed By...
+    content: >
+        
+help_topic:
+    title: Help Topic
+    content: >
+        
+date_range:
+    title: Date Range
+    content: >
+        
+priority_level:
+    title: Priority Level
+    content: >
+        
+search_button_:
+    title: Search (Button)
+    content: >
+        
+reset_button_:
+    title: Reset (Button)
+    content: >
+        
+cancel_button_:
+    title: Cancel (Button)
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/tickets.closed.yaml b/include/i18n/en_US/help/tips/tickets.closed.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..7d9197624bf33e9b2aa044e826308b52585e2930
--- /dev/null
+++ b/include/i18n/en_US/help/tips/tickets.closed.yaml
@@ -0,0 +1,64 @@
+#
+# This is popup help messages for the Staff Panel -> Tickets -> Closed Tickets
+#
+# 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.
+#
+---
+search_field:
+    title: Search Field
+    content: >
+        
+advanced:
+    title: Advanced
+    content: >
+        
+refresh_button_:
+    title: Refresh (Button)
+    content: >
+        
+closed_tickets_table:
+    title: Closed Tickets Table
+    content: >
+        All tickets that have been set to closed.
+        
+ticket:
+    title: Ticket
+    content: >
+        
+date:
+    title: Date
+    content: >
+        
+subject:
+    title: Subject
+    content: >
+        
+from:
+    title: From
+    content: >
+        
+priority:
+    title: Priority
+    content: >
+        
+closed_by:
+    title: Closed By
+    content: >
+        
+reopen_button_:
+    title: Reopen (Button)
+    content: >
+        
+delete_button_:
+    title: Delete (Button)
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/tickets.my_tickets.yaml b/include/i18n/en_US/help/tips/tickets.my_tickets.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..4a369ebf6b1c336e9d81eb970b81307e87d5ecaa
--- /dev/null
+++ b/include/i18n/en_US/help/tips/tickets.my_tickets.yaml
@@ -0,0 +1,71 @@
+#
+# This is popup help messages for the Staff Panel -> Tickets -> My Tickets
+#
+# 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.
+#
+---
+search_field:
+    title: Search Field
+    content: >
+        
+advanced:
+    title: Advanced
+    content: >
+        
+refresh_button_:
+    title: Refresh (Button)
+    content: >
+        
+assigned_tickets_table:
+    title: Assigned Tickets Table
+    content: >
+        Tickets that are currently assigned to you,  as the staff.
+        
+ticket:
+    title: Ticket
+    content: >
+        
+date:
+    title: Date
+    content: >
+        
+subject:
+    title: Subject
+    content: >
+        
+from:
+    title: From
+    content: >
+        
+priority:
+    title: Priority
+    content: >
+        
+department:
+    title: Department
+    content: >
+        
+export:
+    title: Export
+    content: >
+        
+overdue_button_:
+    title: Overdue (Button)
+    content: >
+        
+close_button_:
+    title: Close (Button)
+    content: >
+        
+delete_button_:
+    title: Delete (Button)
+    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/tickets.new_ticket.yaml b/include/i18n/en_US/help/tips/tickets.new_ticket.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..171396516d159f5a51bb93dbab876c4c7c5bced6
--- /dev/null
+++ b/include/i18n/en_US/help/tips/tickets.new_ticket.yaml
@@ -0,0 +1,163 @@
+#
+# This is popup help messages for the Staff Panel -> Tickets -> New Ticket
+#
+# 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.
+#
+---
+new_ticket_table_:
+    title: New Ticket (Table)
+    content: >
+        
+user_information:
+    title: User Information
+    content: >
+        
+email_address:
+    title: Email Address
+    content: >
+        
+full_name:
+    title: Full Name
+    content: >
+        
+ticket_notice:
+    title: Ticket Notice
+    content: >
+        
+ticket_information_options:
+    title: Ticket Information &amp; Options
+    content: >
+        
+ticket_source:
+    title: Ticket Source
+    content: >
+        
+help_topic:
+    title: Help Topic
+    content: >
+        
+department:
+    title: Department
+    content: >
+        
+sla_plan:
+    title: SLA Plan
+    content: >
+        
+due_date:
+    title: Due Date
+    content: >
+        
+assign_to:
+    title: Assign To
+    content: >
+        
+ticket_details:
+    title: Ticket Details
+    content: >
+        
+issue_summary:
+    title: Issue Summary
+    content: >
+        
+issue_details:
+    title: Issue Details
+    content: >
+        
+issue_details_task_bar_:
+    title: Issue Details (Task Bar)
+    content: >
+        
+draft_saved:
+    title: Draft Saved
+    content: >
+        
+trash_button_image_:
+    title: Trash (Button Image)
+    content: >
+        
+priority_level:
+    title: Priority Level
+    content: >
+        
+response:
+    title: Response
+    content: >
+        
+canned_response:
+    title: Canned Response
+    content: >
+        
+append:
+    title: Append
+    content: >
+        
+initial_response_for_the_ticket:
+    title: Initial Response for the Ticket
+    content: >
+        
+initial_response_task_bar_:
+    title: Initial Response (Task Bar)
+    content: >
+        
+draft_saved:
+    title: Draft Saved
+    content: >
+        
+trash_button_image_:
+    title: Trash (Button Image)
+    content: >
+        
+attachments:
+    title: Attachments
+    content: >
+        
+ticket_status:
+    title: Ticket Status
+    content: >
+        
+signature:
+    title: Signature
+    content: >
+        
+response:
+    title: Response
+    content: >
+        
+internal_note:
+    title: Internal Note
+    content: >
+        
+internal_note_task_bar_:
+    title: Internal Note (Task Bar)
+    content: >
+        
+draft_saved:
+    title: Draft Saved
+    content: >
+        
+trash_button_image_:
+    title: Trash (Button Image)
+    content: >
+        
+open_button_:
+    title: Open (Button)
+    content: >
+        
+reset_button_:
+    title: Reset (Button)
+    content: >
+        
+cancel_button_:
+    title: Cancel (Button)
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/tickets.open.yaml b/include/i18n/en_US/help/tips/tickets.open.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9c445b6955011ab4939472215c0b4431ea326f84
--- /dev/null
+++ b/include/i18n/en_US/help/tips/tickets.open.yaml
@@ -0,0 +1,78 @@
+#
+# This is popup help messages for the Staff Panel -> Tickets -> Open
+#
+# 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.
+#
+---
+search_field:
+    title: Search Field
+    content: >
+        
+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: >
+        
+open_tickets_table:
+    title: Open Tickets Table
+    content: >
+        All tickets currently opened and requiring attention
+        
+ticket:
+    title: Ticket
+    content: >
+        
+date:
+    title: Date
+    content: >
+        
+subject:
+    title: Subject
+    content: >
+        
+from:
+    title: From
+    content: >
+        
+priority:
+    title: Priority
+    content: >
+        
+assigned_to:
+    title: Assigned To
+    content: >
+        
+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).
+        
+overdue_button_:
+    title: Overdue (Button)
+    content: >
+        
+close_button_:
+    title: Close (Button)
+    content: >
+        
+delete_button_:
+    title: Delete (Button)
+    content: >
+        
diff --git a/include/i18n/en_US/help/tips/tickets.overdue.yaml b/include/i18n/en_US/help/tips/tickets.overdue.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..51091a082bab1ff25285d8071dfe47fa19055bdb
--- /dev/null
+++ b/include/i18n/en_US/help/tips/tickets.overdue.yaml
@@ -0,0 +1,69 @@
+#
+# This is popup help messages for the Staff Panel -> Tickets -> Overdue
+#
+# 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.
+#
+---
+search_field:
+    title: Search Field
+    content: >
+        
+advanced:
+    title: Advanced
+    content: >
+        
+refresh_button_:
+    title: Refresh (Button)
+    content: >
+        
+overdue_tickets_table:
+    title: Overdue Tickets Table
+    content: >
+        Open Tickets that have exceeded the set SLA Plan for their assigned Help
+        Topic or Department. The department’s SLA Plan will trump the SLA Plan of
+        the Help Topic. 
+        
+ticket:
+    title: Ticket
+    content: >
+        
+date:
+    title: Date
+    content: >
+        
+subject:
+    title: Subject
+    content: >
+        
+from:
+    title: From
+    content: >
+        
+priority:
+    title: Priority
+    content: >
+        
+assigned_to:
+    title: Assigned To
+    content: >
+        
+export:
+    title: Export
+    content: >
+        
+close_button_:
+    title: Close (Button)
+    content: >
+        
+delete_button_:
+    title: Delete (Button)
+    content: >
\ No newline at end of file
diff --git a/include/i18n/en_US/help/tips/tickets.user_lookup_prompt.yaml b/include/i18n/en_US/help/tips/tickets.user_lookup_prompt.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..347f3408dc887ea8045737720b18c30e180fe607
--- /dev/null
+++ b/include/i18n/en_US/help/tips/tickets.user_lookup_prompt.yaml
@@ -0,0 +1,51 @@
+#
+# This is popup help messages for the Staff Panel -> Tickets -> User Look Up (Prompt)
+#
+# 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.
+#
+---
+search_by_email_phone_or_name:
+    title: Search by email, phone or name
+    content: >
+        
+create_new_user:
+    title: Create New User
+    content: >
+        
+email_address:
+    title: Email Address
+    content: >
+        
+full_name:
+    title: Full Name
+    content: >
+        
+phone_number:
+    title: Phone Number
+    content: >
+        
+internal_notes:
+    title: Internal Notes
+    content: >
+        
+reset_button_:
+    title: Reset (Button)
+    content: >
+        
+cancel_button_:
+    title: Cancel (Button)
+    content: >
+        
+add_user_button_:
+    title: Add User (Button)
+    content: >
+        
diff --git a/include/staff/cannedresponses.inc.php b/include/staff/cannedresponses.inc.php
index 4ec32e298f646317216e8a2e7b5e64e0b069a410..59161ac0bfd66620695b3951d359d9719e49e854 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</h2>
+ <h2>Canned Responses&nbsp;<i class="help-tip icon-question-sign" href="#canned_responses_table"></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/categories.inc.php b/include/staff/categories.inc.php
index 3da94517555f0b7aacce87f67362a3bf43c5e3ae..2a139a02796a8ca86d7ecaf99e9292a9906fa8af 100644
--- a/include/staff/categories.inc.php
+++ b/include/staff/categories.inc.php
@@ -41,7 +41,7 @@ else
 
 ?>
 <div style="width:700px;padding-top:5px; float:left;">
- <h2>FAQ Categories</h2>
+ <h2>FAQ Categories&nbsp;<i class="help-tip icon-question-sign" href="#faq_categories"></i></h2>
  </div>
 <div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
     <b><a href="categories.php?a=add" class="Icon newCategory">Add New Category</a></b></div>
diff --git a/include/staff/category.inc.php b/include/staff/category.inc.php
index 76659bde6ffb6b13e6ba639a5f0cf14712ca0ee2..a12d52b79902206dec18b5080213e63a365d6f5e 100644
--- a/include/staff/category.inc.php
+++ b/include/staff/category.inc.php
@@ -36,7 +36,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
     <tbody>
         <tr>
             <th colspan="2">
-                <em>Category information: Public categories are published if it has published FAQ articles.</em>
+                <em>Category information&nbsp;<i class="help-tip icon-question-sign" href="#category_information"></i></em>
             </th>
         </tr>
         <tr>
diff --git a/include/staff/department.inc.php b/include/staff/department.inc.php
index 2a001a4037d5864849f6e5b718227f7270c5648c..3a771fb0b46575ee9346d16788be809327de741a 100644
--- a/include/staff/department.inc.php
+++ b/include/staff/department.inc.php
@@ -55,7 +55,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             <td>
                 <input type="radio" name="ispublic" value="1" <?php echo $info['ispublic']?'checked="checked"':''; ?>><strong>Public</strong>
                 <input type="radio" name="ispublic" value="0" <?php echo !$info['ispublic']?'checked="checked"':''; ?>><strong>Private</strong> (Internal)
-                &nbsp;<span class="error">*&nbsp;</span>
+                &nbsp;<span class="error">*&nbsp;</span>&nbsp;<i class="help-tip icon-question-sign" href="#type"></i>
             </td>
         </tr>
         <tr>
@@ -77,7 +77,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     }
                     ?>
                 </select>
-                &nbsp;<span class="error">*&nbsp;<?php echo $errors['email_id']; ?></span>
+                &nbsp;<span class="error">*&nbsp;<?php echo $errors['email_id']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#email"></i>
             </td>
         </tr>
         <tr>
@@ -97,7 +97,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     }
                     ?>
                 </select>
-                &nbsp;<span class="error">*&nbsp;<?php echo $errors['tpl_id']; ?></span>
+                &nbsp;<span class="error">*&nbsp;<?php echo $errors['tpl_id']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#template"></i>
             </td>
         </tr>
         <tr>
@@ -116,7 +116,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     }
                     ?>
                 </select>
-                &nbsp;<span class="error">*&nbsp;<?php echo $errors['sla_id']; ?></span>
+                &nbsp;<span class="error">*&nbsp;<?php echo $errors['sla_id']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#sla"></i>
             </td>
         </tr>
         <tr>
@@ -147,12 +147,12 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
             <td>
                 <input type="checkbox" name="group_membership" value="0" <?php echo $info['group_membership']?'checked="checked"':''; ?> >
-                Extend membership to groups with access. <i>(Alerts and  notices will include groups)</i>
+                Extend membership to groups with access. <i>(Alerts and  notices will include groups)</i>&nbsp;<i class="help-tip icon-question-sign" href="#group_membership"></i>
             </td>
         </tr>
         <tr>
             <th colspan="2">
-                <em><strong>Auto Response Settings</strong>: Override global auto-response settings for tickets routed to the Dept.</em>
+                <em><strong>Auto Response Settings</strong>: Override global auto-response settings for tickets routed to the Dept.&nbsp;<i class="help-tip icon-question-sign" href="#auto_response_settings"></i></em>
             </th>
         </tr>
         <tr>
@@ -162,7 +162,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             <td>
                 <input type="checkbox" name="ticket_auto_response" value="0" <?php echo !$info['ticket_auto_response']?'checked="checked"':''; ?> >
 
-                <strong>Disable</strong> new ticket auto-response for this Dept.
+                <strong>Disable</strong> new ticket auto-response for this Dept.&nbsp;<i class="help-tip icon-question-sign" href="#new_ticket"></i>
             </td>
         </tr>
         <tr>
@@ -171,7 +171,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
             <td>
                 <input type="checkbox" name="message_auto_response" value="0" <?php echo !$info['message_auto_response']?'checked="checked"':''; ?> >
-                    <strong>Disable</strong> new message auto-response for this Dept.
+                    <strong>Disable</strong> new message auto-response for this Dept.&nbsp;<i class="help-tip icon-question-sign" href="#new_message"></i>
             </td>
         </tr>
         <tr>
@@ -195,12 +195,12 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     }
                     ?>
                 </select>
-                &nbsp;<span class="error">&nbsp;<?php echo $errors['autoresp_email_id']; ?></span>
+                &nbsp;<span class="error">&nbsp;<?php echo $errors['autoresp_email_id']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#auto_response_email"></i>
             </td>
         </tr>
         <tr>
             <th colspan="2">
-                <em><strong>Department Access</strong>: Check all groups allowed to access this department.</em>
+                <em><strong>Department Access</strong>: Check all groups allowed to access this department.&nbsp;<i class="help-tip icon-question-sign" href="#department_access"></i></em>
             </th>
         </tr>
         <tr><td colspan=2><em>Department manager and primary members will always have access independent of group selection or assignment.</em></td></tr>
@@ -223,7 +223,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         ?>
         <tr>
             <th colspan="2">
-                <em><strong>Department Signature</strong>: Optional signature used on outgoing emails. &nbsp;<span class="error">&nbsp;<?php echo $errors['signature']; ?></span></em>
+                <em><strong>Department Signature</strong>: Optional signature used on outgoing emails. &nbsp;<span class="error">&nbsp;<?php echo $errors['signature']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#department_signature"></i></em>
             </th>
         </tr>
         <tr>
diff --git a/include/staff/directory.inc.php b/include/staff/directory.inc.php
index d1c07f439dfc91a1612bb408e03eb88e9a48b928..67289b97e4ac4f48972d55aae3c72063fdc17018 100644
--- a/include/staff/directory.inc.php
+++ b/include/staff/directory.inc.php
@@ -60,7 +60,7 @@ $qstr.='&order='.($order=='DESC'?'ASC':'DESC');
 $query="$select $from $where GROUP BY staff.staff_id ORDER BY $order_by LIMIT ".$pageNav->getStart().",".$pageNav->getLimit();
 //echo $query;
 ?>
-<h2>Staff Members</h2>
+<h2>Staff Members&nbsp;<i class="help-tip icon-question-sign" href="#staff_members"></i></h2>
 <div style="width:700px; float:left;">
     <form action="directory.php" method="GET" name="filter">
        <input type="text" name="q" value="<?php echo Format::htmlchars($_REQUEST['q']); ?>" >
@@ -80,7 +80,7 @@ $query="$select $from $where GROUP BY staff.staff_id ORDER BY $order_by LIMIT ".
              ?>
         </select>
         &nbsp;&nbsp;
-        <input type="submit" name="submit" value="Filter"/>
+        <input type="submit" name="submit" value="Filter"/>&nbsp;&nbsp;<i class="help-tip icon-question-sign" href="#apply_filtering_criteria"></i>
     </form>
  </div>
 <div class="clear"></div>
@@ -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; ?></caption>
+    <caption><?php echo $showing; ?>&nbsp;<i class="help-tip icon-question-sign" href="#showing"></i></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/dynamic-list.inc.php b/include/staff/dynamic-list.inc.php
index 708b9af62f4639186336f1762095347bdbc15b93..27a9584769f953531a39a55f7b47acda53c77a12 100644
--- a/include/staff/dynamic-list.inc.php
+++ b/include/staff/dynamic-list.inc.php
@@ -38,7 +38,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         <tr>
             <th colspan="2">
                 <h4><?php echo $title; ?></h4>
-                <em>Custom lists are used to provide drop-down lists for custom forms</em>
+                <em>Custom lists are used to provide drop-down lists for custom forms. &nbsp;<i class="help-tip icon-question-sign" href="#custom_lists"></i></em>
             </th>
         </tr>
     </thead>
diff --git a/include/staff/email.inc.php b/include/staff/email.inc.php
index bd0acace9d75211d73783415115c82f8f2ce7ea3..9be4743438cabc722855b8c2f73eb726995a9ea4 100644
--- a/include/staff/email.inc.php
+++ b/include/staff/email.inc.php
@@ -135,7 +135,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <th colspan="2">
-                <em><strong>Login Information:</strong>: Optional BUT required when IMAP/POP or SMTP (with auth.) are enabled.</em>
+                <em><strong>Login Information:</strong>&nbsp;<i class="help-tip icon-question-sign" href="#login_information"></i></em>
             </th>
         </tr>
         <tr>
diff --git a/include/staff/filter.inc.php b/include/staff/filter.inc.php
index 8590c914915618808cc8a4776e0cab3e5800d725..5c417fdf7af65ab684f5c93e15ba2f4c54924c77 100644
--- a/include/staff/filter.inc.php
+++ b/include/staff/filter.inc.php
@@ -57,7 +57,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                 &nbsp;<span class="error">*&nbsp;<?php echo $errors['execorder']; ?></span>
                 &nbsp;&nbsp;&nbsp;
                 <input type="checkbox" name="stop_onmatch" value="1" <?php echo $info['stop_onmatch']?'checked="checked"':''; ?> >
-                <strong>Stop</strong> processing further on match!
+                <strong>Stop</strong> processing further on match!&nbsp;<i class="help-tip icon-question-sign" href="#execution_order"></i>
             </td>
         </tr>
         <tr>
@@ -96,12 +96,12 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     ?>
                 </select>
                 &nbsp;
-                <span class="error">*&nbsp;<?php echo $errors['target']; ?></span>
+                <span class="error">*&nbsp;<?php echo $errors['target']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#target"></i>
             </td>
         </tr>
         <tr>
             <th colspan="2">
-                <em><strong>Filter Rules</strong>: Rules are applied based on the criteria.&nbsp;<span class="error">*&nbsp;<?php echo $errors['rules']; ?></span></em>
+                <em><strong>Filter Rules</strong>: Rules are applied based on the criteria.&nbsp;<span class="error">*&nbsp;<?php echo $errors['rules']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#basic_fields_criterion"></i></em>
             </th>
         </tr>
         <tr>
@@ -112,7 +112,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                 &nbsp;&nbsp;&nbsp;
                 <input type="radio" name="match_all_rules" value="0" <?php echo !$info['match_all_rules']?'checked="checked"':''; ?>>Match Any
                 &nbsp;<span class="error">*&nbsp;</span>
-                <em>(case-insensitive comparison)</em>
+                <em>(case-insensitive comparison)</em>&nbsp;<i class="help-tip icon-question-sign" href="#rules_matching_criteria"></i>
 
             </td>
         </tr>
@@ -142,7 +142,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                             echo sprintf('<option value="%s" %s>%s</option>',$k,$sel,$v);
                         }
                         ?>
-                    </select>
+                    </select>&nbsp;<i class="help-tip icon-question-sign" href="#criterion_operator"></i>
                     <input type="text" size="60" name="rule_v<?php echo $i; ?>" value="<?php echo $info["rule_v$i"]; ?>">
                     &nbsp;<span class="error">&nbsp;<?php echo $errors["rule_$i"]; ?></span>
                 <?php
@@ -168,7 +168,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
             <td>
                 <input type="checkbox" name="reject_ticket" value="1" <?php echo $info['reject_ticket']?'checked="checked"':''; ?> >
-                    <strong><font class="error">Reject Ticket</font></strong> <em>(All other actions and filters are ignored)</em>
+                    <strong><font class="error">Reject Ticket</font></strong>&nbsp;<i class="help-tip icon-question-sign" href="#reject_ticket"></i>
             </td>
         </tr>
         <tr>
@@ -177,7 +177,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
             <td>
                 <input type="checkbox" name="use_replyto_email" value="1" <?php echo $info['use_replyto_email']?'checked="checked"':''; ?> >
-                    <strong>Use</strong> Reply-To Email <em>(if available)</em>
+                    <strong>Use</strong> Reply-To Email <em>(if available)&nbsp;<i class="help-tip icon-question-sign" href="#reply_to_email"></i></em>
             </td>
         </tr>
         <tr>
@@ -210,7 +210,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     }
                     ?>
                 </select>
-                <em>(Automatically respond with this canned response)</em>
+                <em>(Sent Automatically)&nbsp;<i class="help-tip icon-question-sign" href="#canned_response"></i></em>
             </td>
         </tr>
         <tr>
@@ -340,7 +340,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <th colspan="2">
-                <em><strong>Admin Notes</strong>: Internal notes.&nbsp;</em>
+                <em><strong>Admin Notes</strong>: Internal notes.&nbsp;<i class="help-tip icon-question-sign" href="#admin_notes"></i></em>
             </th>
         </tr>
         <tr>
diff --git a/include/staff/helptopic.inc.php b/include/staff/helptopic.inc.php
index 9e9a34d142369997a3ccc32cc499045b4716de9e..d0e6e9cf6fea46d528c0ddb4d6a5fd56f456913f 100644
--- a/include/staff/helptopic.inc.php
+++ b/include/staff/helptopic.inc.php
@@ -31,7 +31,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         <tr>
             <th colspan="2">
                 <h4><?php echo $title; ?></h4>
-                <em>Help Topic Information</em>
+                <em>Help Topic Information&nbsp;<i class="help-tip icon-question-sign" href="#help_topic_information"></i></em>
             </th>
         </tr>
     </thead>
@@ -42,7 +42,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
             <td>
                 <input type="text" size="30" name="topic" value="<?php echo $info['topic']; ?>">
-                &nbsp;<span class="error">*&nbsp;<?php echo $errors['topic']; ?></span>
+                &nbsp;<span class="error">*&nbsp;<?php echo $errors['topic']; ?></span> <i class="help-tip icon-question-sign" href="#topic"></i>
             </td>
         </tr>
         <tr>
@@ -52,7 +52,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             <td>
                 <input type="radio" name="isactive" value="1" <?php echo $info['isactive']?'checked="checked"':''; ?>>Active
                 <input type="radio" name="isactive" value="0" <?php echo !$info['isactive']?'checked="checked"':''; ?>>Disabled
-                &nbsp;<span class="error">*&nbsp;</span>
+                &nbsp;<span class="error">*&nbsp;</span> <i class="help-tip icon-question-sign" href="#status"></i>
             </td>
         </tr>
         <tr>
@@ -62,7 +62,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             <td>
                 <input type="radio" name="ispublic" value="1" <?php echo $info['ispublic']?'checked="checked"':''; ?>>Public
                 <input type="radio" name="ispublic" value="0" <?php echo !$info['ispublic']?'checked="checked"':''; ?>>Private/Internal
-                &nbsp;<span class="error">*&nbsp;</span>
+                &nbsp;<span class="error">*&nbsp;</span> <i class="help-tip icon-question-sign" href="#type"></i>
             </td>
         </tr>
         <tr>
@@ -83,7 +83,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                         }
                     }
                     ?>
-                </select> (<em>optional</em>)
+                </select> (<em>optional</em>) <i class="help-tip icon-question-sign" href="#parent_topic"></i>
                 &nbsp;<span class="error">&nbsp;<?php echo $errors['pid']; ?></span>
             </td>
         </tr>
@@ -102,7 +102,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                <?php } ?>
                </select>
                <em>Extra information for tickets associated with this help topic</em>
-               &nbsp;<span class="error">&nbsp;<?php echo $errors['form_id']; ?></span>
+               &nbsp;<span class="error">&nbsp;<?php echo $errors['form_id']; ?></span> <i class="help-tip icon-question-sign" href="#custom_form"></i>
            </td>
        </tr>
         <tr>
@@ -122,7 +122,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     }
                     ?>
                 </select>
-                &nbsp;<span class="error">&nbsp;<?php echo $errors['priority_id']; ?></span>
+                &nbsp;<span class="error">&nbsp;<?php echo $errors['priority_id']; ?></span><i class="help-tip icon-question-sign" href="#priority"></i>
             </td>
         </tr>
         <tr>
@@ -142,7 +142,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     }
                     ?>
                 </select>
-                &nbsp;<span class="error">*&nbsp;<?php echo $errors['dept_id']; ?></span>
+                &nbsp;<span class="error">*&nbsp;<?php echo $errors['dept_id']; ?></span> <i class="help-tip icon-question-sign" href="#department"></i>
             </td>
         </tr>
         <tr>
@@ -162,7 +162,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     ?>
                 </select>
                 &nbsp;<span class="error">&nbsp;<?php echo $errors['sla_id']; ?></span>
-                <em>(Overrides department's SLA)</em>
+                <em>(Overrides department's SLA)</em> <i class="help-tip icon-question-sign" href="#sla_plan"></i>
             </td>
         </tr>
         <tr>
@@ -182,7 +182,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     }
                     ?>
                 </select>&nbsp;<font class="error"><?php echo $errors['page_id']; ?></font>
-                <em>(Overrides global setting. Applies to web tickets only.)</em>
+                <em>(Overrides global setting. Applies to web tickets only.)</em> <i class="help-tip icon-question-sign" href="#thank_you_page"></i>
             </td>
         </tr>
         <tr>
@@ -220,7 +220,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     }
                     ?>
                 </select>
-                &nbsp;<span class="error">&nbsp;<?php echo $errors['assign']; ?></span>
+                &nbsp;<span class="error">&nbsp;<?php echo $errors['assign']; ?></span> <i class="help-tip icon-question-sign" href="#auto_assign_to"></i>
             </td>
         </tr>
         <tr>
@@ -230,12 +230,12 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             <td>
                 <input type="checkbox" name="noautoresp" value="1" <?php echo $info['noautoresp']?'checked="checked"':''; ?> >
                     <strong>Disable</strong> new ticket auto-response for
-                    this topic (Overrides Dept. settings).
+                    this topic (Overrides Dept. settings). <i class="help-tip icon-question-sign" href="#ticket_auto_response"></i>
             </td>
         </tr>
         <tr>
             <th colspan="2">
-                <em><strong>Admin Notes</strong>: Internal notes about the help topic.&nbsp;</em>
+                <em><strong>Admin Notes</strong>: Internal notes about the help topic.&nbsp;<i class="help-tip icon-question-sign" href="#admin_notes"></i></em>
             </th>
         </tr>
         <tr>
diff --git a/include/staff/page.inc.php b/include/staff/page.inc.php
index 884d7377eacb64d6152eda71373e504716a290fd..4cbe67ce8e0836ea8ee3134ac0e856a6a57fff7f 100644
--- a/include/staff/page.inc.php
+++ b/include/staff/page.inc.php
@@ -103,7 +103,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <th colspan="2">
-                <em><strong>Admin Notes</strong>: Internal notes.&nbsp;</em>
+                <em><strong>Admin Notes</strong>: Internal notes.&nbsp;<i class="help-tip icon-question-sign" href="#admin_notes"></i></em>
             </th>
         </tr>
         <tr>
diff --git a/include/staff/profile.inc.php b/include/staff/profile.inc.php
index 5c73661a5cef1acd3c9ae0751e034b02f2ba8335..0c34376116ea8b5086a63c756d3a36a4feecd7f9 100644
--- a/include/staff/profile.inc.php
+++ b/include/staff/profile.inc.php
@@ -25,7 +25,7 @@ $info['id']=$staff->getId();
             <td width="180" class="required">
                 Username:
             </td>
-            <td><b><?php echo $staff->getUserName(); ?></b></td>
+            <td><b><?php echo $staff->getUserName(); ?></b>&nbsp;<i class="help-tip icon-question-sign" href="#username"></i></td>
         </tr>
 
         <tr>
@@ -197,7 +197,7 @@ $info['id']=$staff->getId();
             <td>Show Assigned Tickets:</td>
             <td>
                 <input type="checkbox" name="show_assigned_tickets" <?php echo $info['show_assigned_tickets']?'checked="checked"':''; ?>>
-                <em>Show assigned tickets on open queue.</em>
+                <em>Show assigned tickets on open queue.&nbsp;<i class="help-tip icon-question-sign" href="#show_assigned_tickets"></i></em>
             </td>
         </tr>
         <tr>
@@ -237,7 +237,7 @@ $info['id']=$staff->getId();
         <tr>
             <th colspan="2">
                 <em><strong>Signature</strong>: Optional signature used on outgoing emails.
-                &nbsp;<span class="error">&nbsp;<?php echo $errors['signature']; ?></span></em>
+                &nbsp;<span class="error">&nbsp;<?php echo $errors['signature']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#signature"></i></em>
             </th>
         </tr>
         <tr>
diff --git a/include/staff/settings-access.inc.php b/include/staff/settings-access.inc.php
index 35c8ef8a53915b2220e4d9a14c79544673b8009b..647d0f3c8851673b57809f4922a8060c6e397f8e 100644
--- a/include/staff/settings-access.inc.php
+++ b/include/staff/settings-access.inc.php
@@ -32,14 +32,14 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
                     ?>
                 </select>
                 <font class="error"><?php echo $errors['passwd_reset_period']; ?></font>
-                <i class="help-tip icon-question-sign" href="#password_reset"></i>
+                <i class="help-tip icon-question-sign" href="#password_expiration_policy"></i>
             </td>
         </tr>
         <tr><td>Allow Password Resets:</th>
             <td>
               <input type="checkbox" name="allow_pw_reset" <?php echo $config['allow_pw_reset']?'checked="checked"':''; ?>>
               <em>Enables the <u>Forgot my password</u> link on the staff
-              control panel</em>
+              control panel.</em> <i class="help-tip icon-question-sign" href="#allow_password_resets"></i>
             </td>
         </tr>
         <tr><td>Password Reset Window:</th>
@@ -47,7 +47,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
               <input type="text" name="pw_reset_window" size="6" value="<?php
                     echo $config['pw_reset_window']; ?>">
                 Maximum time <em>in minutes</em> a password reset token can
-                be valid.
+                be valid. <i class="help-tip icon-question-sign" href="#password_reset_window"></i>
                 &nbsp;<font class="error">&nbsp;<?php echo $errors['pw_reset_window']; ?></font>
             </td>
         </tr>
@@ -72,13 +72,13 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
         <tr><td>Staff Session Timeout:</td>
             <td>
               <input type="text" name="staff_session_timeout" size=6 value="<?php echo $config['staff_session_timeout']; ?>">
-                Maximum idle time in minutes before a staff member must log in again (enter 0 to disable).
+                Maximum idle time in minutes before a staff member must log in again (enter 0 to disable). <i class="help-tip icon-question-sign" href="#staff_session_timeout"></i>
             </td>
         </tr>
         <tr><td>Bind Staff Session to IP:</td>
             <td>
               <input type="checkbox" name="staff_ip_binding" <?php echo $config['staff_ip_binding']?'checked="checked"':''; ?>>
-              <em>(binds staff session to originating IP address upon login)</em>
+              <i class="help-tip icon-question-sign" href="#bind_staff_session_to_ip"></i>
             </td>
         </tr>
         <tr>
@@ -128,7 +128,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
         <tr><td>Client Session Timeout:</td>
             <td>
               <input type="text" name="client_session_timeout" size=6 value="<?php echo $config['client_session_timeout']; ?>">
-                &nbsp;Maximum idle time in minutes before a client must log in again (enter 0 to disable).
+                &nbsp;Maximum idle time in minutes before a client must log in again (enter 0 to disable). <i class="help-tip icon-question-sign" href="#client_session_timeout"></i>
             </td>
         </tr>
     </tbody>
diff --git a/include/staff/settings-alerts.inc.php b/include/staff/settings-alerts.inc.php
index c0dbc628e38bae07c38eac2da5a83258229e56c3..9eb4691f4815f1db24899956f42d0bba7c0b9968 100644
--- a/include/staff/settings-alerts.inc.php
+++ b/include/staff/settings-alerts.inc.php
@@ -12,13 +12,13 @@
     </thead>
     <tbody>
         <tr><th><em><b>New Ticket Alert</b>:
-            <i class="help-tip icon-question-sign" href="#new_ticket"></i>
+            <i class="help-tip icon-question-sign" href="#new_ticket_alert"></i>
             </em></th></tr>
         <tr>
             <td><em><b>Status:</b></em> &nbsp;
                 <input type="radio" name="ticket_alert_active"  value="1"   <?php echo $config['ticket_alert_active']?'checked':''; ?> />Enable
                 <input type="radio" name="ticket_alert_active"  value="0"   <?php echo !$config['ticket_alert_active']?'checked':''; ?> />Disable
-                &nbsp;&nbsp;<font class="error">&nbsp;<?php echo $errors['ticket_alert_active']; ?></font></em>
+                &nbsp;&nbsp;<font class="error">&nbsp;<?php echo $errors['ticket_alert_active']; ?></font></em> <i class="help-tip icon-question-sign" href="#status"></i>
              </td>
         </tr>
         <tr>
@@ -42,28 +42,29 @@
             </td>
         </tr>
         <tr><th><em><b>New Message Alert</b>:
-            <i class="help-tip icon-question-sign" href="#new_message"></i>
+            <i class="help-tip icon-question-sign" href="#new_message_alert"></i>
             </em></th></tr>
         <tr>
             <td><em><b>Status:</b></em> &nbsp; 
               <input type="radio" name="message_alert_active"  value="1"   <?php echo $config['message_alert_active']?'checked':''; ?> />Enable
               &nbsp;&nbsp;
               <input type="radio" name="message_alert_active"  value="0"   <?php echo !$config['message_alert_active']?'checked':''; ?> />Disable
+              <i class="help-tip icon-question-sign" href="#status_2"></i>
             </td>
         </tr>
         <tr>
             <td>
-              <input type="checkbox" name="message_alert_laststaff" <?php echo $config['message_alert_laststaff']?'checked':''; ?>> Last Respondent
+              <input type="checkbox" name="message_alert_laststaff" <?php echo $config['message_alert_laststaff']?'checked':''; ?>> Last Respondent <i class="help-tip icon-question-sign" href="#last_respondent"></i>
             </td>
         </tr>
         <tr>
             <td>
-              <input type="checkbox" name="message_alert_assigned" <?php echo $config['message_alert_assigned']?'checked':''; ?>> Assigned Staff
+              <input type="checkbox" name="message_alert_assigned" <?php echo $config['message_alert_assigned']?'checked':''; ?>> Assigned Staff <i class="help-tip icon-question-sign" href="#assigned_staff"></i>
             </td>
         </tr>
         <tr>
             <td>
-              <input type="checkbox" name="message_alert_dept_manager" <?php echo $config['message_alert_dept_manager']?'checked':''; ?>> Department Manager <em>(spammy)</em>
+              <input type="checkbox" name="message_alert_dept_manager" <?php echo $config['message_alert_dept_manager']?'checked':''; ?>> Department Manager <em>(spammy)</em> <i class="help-tip icon-question-sign" href="#department_manager"></i>
             </td>
         </tr>
         <tr>
@@ -72,7 +73,7 @@
             </td>
         </tr>
         <tr><th><em><b>New Internal Note Alert</b>:
-            <i class="help-tip icon-question-sign" href="#new_activity"></i>
+            <i class="help-tip icon-question-sign" href="#new_internal_note_alert"></i>
             </em></th></tr>
         <tr>
             <td><em><b>Status:</b></em> &nbsp;
@@ -84,16 +85,21 @@
         </tr>
         <tr>
             <td>
-              <input type="checkbox" name="note_alert_assigned" <?php echo $config['note_alert_assigned']?'checked':''; ?>> Assigned Staff
+              <input type="checkbox" name="note_alert_laststaff" <?php echo $config['note_alert_laststaff']?'checked':''; ?>> Last Respondent <i class="help-tip icon-question-sign" href="#last_respondent_2"></i>
             </td>
         </tr>
         <tr>
             <td>
-              <input type="checkbox" name="note_alert_dept_manager" <?php echo $config['note_alert_dept_manager']?'checked':''; ?>> Department Manager <em>(spammy)</em>
+              <input type="checkbox" name="note_alert_assigned" <?php echo $config['note_alert_assigned']?'checked':''; ?>> Assigned Staff <i class="help-tip icon-question-sign" href="#assigned_staff_2"></i>
+            </td>
+        </tr>
+        <tr>
+            <td>
+              <input type="checkbox" name="note_alert_dept_manager" <?php echo $config['note_alert_dept_manager']?'checked':''; ?>> Department Manager <em>(spammy)</em> <i class="help-tip icon-question-sign" href="#department_manager_2"></i>
             </td>
         </tr>
         <tr><th><em><b>Ticket Assignment Alert</b>:
-            <i class="help-tip icon-question-sign" href="#assign_alert"></i>
+            <i class="help-tip icon-question-sign" href="#ticket_assignment_alert"></i>
             </em></th></tr>
         <tr>
             <td><em><b>Status: </b></em> &nbsp;
@@ -105,22 +111,22 @@
         </tr>
         <tr>
             <td>
-              <input type="checkbox" name="assigned_alert_staff" <?php echo $config['assigned_alert_staff']?'checked':''; ?>> Assigned Staff
+              <input type="checkbox" name="assigned_alert_staff" <?php echo $config['assigned_alert_staff']?'checked':''; ?>> Assigned Staff <i class="help-tip icon-question-sign" href="#assigned_staff_3"></i>
             </td>
         </tr>
         <tr>
             <td>
-              <input type="checkbox"name="assigned_alert_team_lead" <?php echo $config['assigned_alert_team_lead']?'checked':''; ?>>Team Lead <em>(On team assignment)</em>
+              <input type="checkbox"name="assigned_alert_team_lead" <?php echo $config['assigned_alert_team_lead']?'checked':''; ?>>Team Lead <em>(On team assignment)</em> <i class="help-tip icon-question-sign" href="#team_lead"></i>
             </td>
         </tr>
         <tr>
             <td>
               <input type="checkbox"name="assigned_alert_team_members" <?php echo $config['assigned_alert_team_members']?'checked':''; ?>>
-                Team Members <em>(spammy)</em>
+                Team Members <em>(spammy)</em> <i class="help-tip icon-question-sign" href="#team_members"></i>
             </td>
         </tr>
         <tr><th><em><b>Ticket Transfer Alert</b>:
-            <i class="help-tip icon-question-sign" href="#transfer_alert"></i>
+            <i class="help-tip icon-question-sign" href="#ticket_transfer_alert"></i>
             </em></th></tr>
         <tr>
             <td><em><b>Status:</b></em> &nbsp;
@@ -131,22 +137,22 @@
         </tr>
         <tr>
             <td>
-              <input type="checkbox" name="transfer_alert_assigned" <?php echo $config['transfer_alert_assigned']?'checked':''; ?>> Assigned Staff/Team
+              <input type="checkbox" name="transfer_alert_assigned" <?php echo $config['transfer_alert_assigned']?'checked':''; ?>> Assigned Staff/Team <i class="help-tip icon-question-sign" href="#assigned_staff_team"></i>
             </td>
         </tr>
         <tr>
             <td>
-              <input type="checkbox" name="transfer_alert_dept_manager" <?php echo $config['transfer_alert_dept_manager']?'checked':''; ?>> Department Manager
+              <input type="checkbox" name="transfer_alert_dept_manager" <?php echo $config['transfer_alert_dept_manager']?'checked':''; ?>> Department Manager <i class="help-tip icon-question-sign" href="#department_manager_3"></i>
             </td>
         </tr>
         <tr>
             <td>
               <input type="checkbox" name="transfer_alert_dept_members" <?php echo $config['transfer_alert_dept_members']?'checked':''; ?>>
-                Department Members <em>(spammy)</em>
+                Department Members <em>(spammy)</em> <i class="help-tip icon-question-sign" href="#department_members"></i>
             </td>
         </tr>
         <tr><th><em><b>Overdue Ticket Alert</b>:
-            <i class="help-tip icon-question-sign" href="#stale_alert"></i>
+            <i class="help-tip icon-question-sign" href="#overdue_ticket_alert"></i>
             </em></th></tr>
         <tr>
             <td><em><b>Status:</b></em> &nbsp;
@@ -157,25 +163,25 @@
         </tr>
         <tr>
             <td>
-              <input type="checkbox" name="overdue_alert_assigned" <?php echo $config['overdue_alert_assigned']?'checked':''; ?>> Assigned Staff/Team
+              <input type="checkbox" name="overdue_alert_assigned" <?php echo $config['overdue_alert_assigned']?'checked':''; ?>> Assigned Staff/Team <i class="help-tip icon-question-sign" href="#assigned_staff_team_2"></i>
             </td>
         </tr>
         <tr>
             <td>
-              <input type="checkbox" name="overdue_alert_dept_manager" <?php echo $config['overdue_alert_dept_manager']?'checked':''; ?>> Department Manager
+              <input type="checkbox" name="overdue_alert_dept_manager" <?php echo $config['overdue_alert_dept_manager']?'checked':''; ?>> Department Manager <i class="help-tip icon-question-sign" href="#department_manager_4"></i>
             </td>
         </tr>
         <tr>
             <td>
-              <input type="checkbox" name="overdue_alert_dept_members" <?php echo $config['overdue_alert_dept_members']?'checked':''; ?>> Department Members <em>(spammy)</em>
+              <input type="checkbox" name="overdue_alert_dept_members" <?php echo $config['overdue_alert_dept_members']?'checked':''; ?>> Department Members <em>(spammy)</em> <i class="help-tip icon-question-sign" href="#department_members_2"></i>
             </td>
         </tr>
         <tr><th><em><b>System Alerts</b>:
-            <i class="help-tip icon-question-sign" href="#meltdowns"></i>
+            <i class="help-tip icon-question-sign" href="#system_alerts"></i>
             </em></th></tr>
         <tr>
             <td>
-              <input type="checkbox" name="send_sys_errors" checked="checked" disabled="disabled">System Errors
+              <input type="checkbox" name="send_sys_errors" checked="checked" disabled="disabled">System Errors <i class="help-tip icon-question-sign" href="#system_errors"></i>
             </td>
         </tr>
         <tr>
@@ -185,7 +191,7 @@
         </tr>
         <tr>
             <td>
-              <input type="checkbox" name="send_login_errors" <?php echo $config['send_login_errors']?'checked':''; ?>>Excessive Login attempts
+              <input type="checkbox" name="send_login_errors" <?php echo $config['send_login_errors']?'checked':''; ?>>Excessive Login attempts <i class="help-tip icon-question-sign" href="#excessive_login_attempts"></i>
             </td>
         </tr>
     </tbody>
diff --git a/include/staff/settings-autoresp.inc.php b/include/staff/settings-autoresp.inc.php
index 927bc56a5b3c94ffb0ea14835b6682c99574014f..856a0a7780d50838e977064221e0e70776493c4a 100644
--- a/include/staff/settings-autoresp.inc.php
+++ b/include/staff/settings-autoresp.inc.php
@@ -28,7 +28,7 @@ echo $config['ticket_autoresponder'] ? 'checked="checked"' : ''; ?>/>
                 <input type="checkbox" name="ticket_notice_active" <?php
 echo $config['ticket_notice_active'] ? 'checked="checked"' : ''; ?>/>
                 Ticket Owner&nbsp;
-                <i class="help-tip icon-question-sign" href="#new_staff_ticket"></i>
+                <i class="help-tip icon-question-sign" href="#new_ticket_by_staff"></i>
             </td>
         </tr>
         <tr>
@@ -37,7 +37,7 @@ echo $config['ticket_notice_active'] ? 'checked="checked"' : ''; ?>/>
                 <input type="checkbox" name="message_autoresponder" <?php
 echo $config['message_autoresponder'] ? 'checked="checked"' : ''; ?>/>
                 Submitter: Send receipt confirmation&nbsp;
-                <i class="help-tip icon-question-sign" href="#new_message"></i>
+                <i class="help-tip icon-question-sign" href="#new_message_for_submitter"></i>
             </td>
         </tr>
         <tr>
@@ -45,7 +45,7 @@ echo $config['message_autoresponder'] ? 'checked="checked"' : ''; ?>/>
                 <input type="checkbox" name="message_autoresponder_collabs" <?php
 echo $config['message_autoresponder_collabs'] ? 'checked="checked"' : ''; ?>/>
                 Participants: Send new activity notice&nbsp;
-                <i class="help-tip icon-question-sign" href="#collaborators"></i>
+                <i class="help-tip icon-question-sign" href="#new_message_for_participants"></i>
                 </div>
             </td>
         </tr>
diff --git a/include/staff/settings-emails.inc.php b/include/staff/settings-emails.inc.php
index e42691430cd2583d4068bca30f99b7985770b30b..aa2f653b7e65631d32d3c230c219b60cfef05eb9 100644
--- a/include/staff/settings-emails.inc.php
+++ b/include/staff/settings-emails.inc.php
@@ -30,7 +30,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
                         }
                     } ?>
                 </select>&nbsp;<font class="error">*&nbsp;<?php echo $errors['default_template_id']; ?></font>
-                <i class="help-tip icon-question-sign" href="#default_templates"></i>
+                <i class="help-tip icon-question-sign" href="#default_email_templates"></i>
             </td>
         </tr>
         <tr>
@@ -50,7 +50,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
                     } ?>
                  </select>
                  &nbsp;<font class="error">*&nbsp;<?php echo $errors['default_email_id']; ?></font>
-                <i class="help-tip icon-question-sign" href="#default_email"></i>
+                <i class="help-tip icon-question-sign" href="#default_system_email"></i>
             </td>
         </tr>
         <tr>
@@ -78,17 +78,17 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
             <td>
                 <input type="text" size=40 name="admin_email" value="<?php echo $config['admin_email']; ?>">
                     &nbsp;<font class="error">*&nbsp;<?php echo $errors['admin_email']; ?></font>
-                <i class="help-tip icon-question-sign" href="#admin_email"></i>
+                <i class="help-tip icon-question-sign" href="#admins_email_address"></i>
             </td>
         </tr>
         <tr><th colspan=2><em><strong>Incoming Emails:</strong>&nbsp;
-            <i class="help-tip icon-question-sign" href="#incoming_email"></i>
+            <i class="help-tip icon-question-sign" href="#incoming_emails"></i>
             </em></th>
         <tr>
             <td width="180">Email Polling:</td>
             <td><input type="checkbox" name="enable_mail_polling" value=1 <?php echo $config['enable_mail_polling']? 'checked="checked"': ''; ?>  > Enable POP/IMAP polling
                 &nbsp;
-                <i class="help-tip icon-question-sign" href="#enable_email_poll"></i>
+                <i class="help-tip icon-question-sign" href="#email_polling"></i>
                 &nbsp;
                  <input type="checkbox" name="enable_auto_cron" <?php echo $config['enable_auto_cron']?'checked="checked"':''; ?>>
                  Poll on auto-cron&nbsp;
@@ -114,7 +114,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
             <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>
-                <i class="help-tip icon-question-sign" href="#use_email_priority"></i>
+                <i class="help-tip icon-question-sign" href="#emailed_tickets_priority"></i>
             </td>
         </tr>
         <tr>
@@ -128,7 +128,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
             <td><input type="checkbox" name="add_email_collabs" <?php
     echo $config['add_email_collabs'] ? 'checked="checked"' : ''; ?>/>
             Automatically add collaborators from email fields&nbsp;
-            <i class="help-tip icon-question-sign" href="#add_email_collabs"></i>
+            <i class="help-tip icon-question-sign" href="#accept_email_collaborators"></i>
         </tr>
         <tr><th colspan=2><em><strong>Outgoing Emails</strong>: Default email only applies to outgoing emails without SMTP setting.</em></th></tr>
         <tr><td width="180">Default Outgoing Email:</td>
diff --git a/include/staff/settings-kb.inc.php b/include/staff/settings-kb.inc.php
index 726c822f617e19bc4983cabcccbe19c9977f28d3..ed1a3b8d5ed473244104a9df1d06547fd863342b 100644
--- a/include/staff/settings-kb.inc.php
+++ b/include/staff/settings-kb.inc.php
@@ -20,7 +20,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
             <td>
               <input type="checkbox" name="enable_kb" value="1" <?php echo $config['enable_kb']?'checked="checked"':''; ?>>
               Enable Knowledge base&nbsp;<em>(Client interface)</em>
-              &nbsp;<font class="error">&nbsp;<?php echo $errors['enable_kb']; ?></font>
+              &nbsp;<font class="error">&nbsp;<?php echo $errors['enable_kb']; ?></font> <i class="help-tip icon-question-sign" href="#knowledge_base_status"></i>
             </td>
         </tr>
         <tr>
@@ -28,7 +28,7 @@ if(!defined('OSTADMININC') || !$thisstaff || !$thisstaff->isAdmin() || !$config)
             <td>
                 <input type="checkbox" name="enable_premade" value="1" <?php echo $config['enable_premade']?'checked="checked"':''; ?> >
                 Enable canned responses&nbsp;<em>(Available on ticket reply)</em>
-                &nbsp;<font class="error">&nbsp;<?php echo $errors['enable_premade']; ?></font>
+                &nbsp;<font class="error">&nbsp;<?php echo $errors['enable_premade']; ?></font> <i class="help-tip icon-question-sign" href="#canned_responses"></i>
             </td>
         </tr>
     </tbody>
diff --git a/include/staff/settings-pages.inc.php b/include/staff/settings-pages.inc.php
index 7b75501d55fe8d1d9706eda5bcfe91bab72ded64..bef09743f1ea2c45e9238f6e874645d07161b0f6 100644
--- a/include/staff/settings-pages.inc.php
+++ b/include/staff/settings-pages.inc.php
@@ -105,8 +105,7 @@ $pages = Page::getPages();
         </td></tr>
         <tr>
             <th colspan="2">
-                <em>Use a custom logo &mdash; Use a delete checkbox to
-                remove the logo from the system</em>
+                <em>Use a custom logo&nbsp;<i class="help-tip icon-question-sign" href="#upload_a_new_logo"></i></em>
             </th>
         </tr>
         <tr><td colspan="2">
diff --git a/include/staff/settings-system.inc.php b/include/staff/settings-system.inc.php
index 3156492fb8fe6de114d4e0290a83a7736026e8a1..814f3685349ed59308e408491f90aef951120b5b 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>: Offline mode will disable client interface and only allow admins to login to Staff Control Panel.</em>
             </th>
         </tr>
     </thead>
@@ -39,7 +39,7 @@ $gmtime = Misc::gmtime();
             <td width="220" class="required">Helpdesk Name/Title:</td>
             <td><input type="text" size="40" name="helpdesk_title" value="<?php echo $config['helpdesk_title']; ?>">
                 &nbsp;<font class="error">*&nbsp;<?php echo $errors['helpdesk_title']; ?></font>
-                <i class="help-tip icon-question-sign" href="#helpdesk_name"></i>
+                <i class="help-tip icon-question-sign" href="#helpdesk_name_title"></i>
             </td>
         </tr>
         <tr>
@@ -57,7 +57,7 @@ $gmtime = Misc::gmtime();
                         }
                     } ?>
                 </select>&nbsp;<font class="error">*&nbsp;<?php echo $errors['default_dept_id']; ?></font>
-                <i class="help-tip icon-question-sign" href="#default_dept"></i>
+                <i class="help-tip icon-question-sign" href="#default_department"></i>
             </td>
         </tr>
 
@@ -72,7 +72,7 @@ $gmtime = Misc::gmtime();
                         <?php
                     } ?>
                 </select>
-                <i class="help-tip icon-question-sign" href="#page_size"></i>
+                <i class="help-tip icon-question-sign" href="#default_page_size"></i>
             </td>
         </tr>
         <tr>
@@ -85,7 +85,7 @@ $gmtime = Misc::gmtime();
                     <option value=1 <?php echo $config['log_level'] == 1 ? 'selected="selected"':''; ?>> ERROR</option>
                 </select>
                 <font class="error">&nbsp;<?php echo $errors['log_level']; ?></font>
-                <i class="help-tip icon-question-sign" href="#log_level"></i>
+                <i class="help-tip icon-question-sign" href="#default_log_level"></i>
             </td>
         </tr>
         <tr>
@@ -115,13 +115,13 @@ $gmtime = Misc::gmtime();
                         ?>><?php echo $desc; ?></option>
 <?php } ?>
                 </select>
-                <i class="help-tip icon-question-sign" href="#name_format"></i>
+                <i class="help-tip icon-question-sign" href="#default_name_formatting"></i>
             </td>
         </tr>
         <tr>
             <th colspan="2">
                 <em><b>Date and Time Options</b>&nbsp;
-                <i class="help-tip icon-question-sign" href="#date_and_time"></i>
+                <i class="help-tip icon-question-sign" href="#date_time_options"></i>
                 </em>
             </th>
         </tr>
diff --git a/include/staff/settings-tickets.inc.php b/include/staff/settings-tickets.inc.php
index 796ffcdd1bca64af46cac9282d991aa2066dbbd5..e8580cdb09aae25417cf9ed1f02fd45370e37517 100644
--- a/include/staff/settings-tickets.inc.php
+++ b/include/staff/settings-tickets.inc.php
@@ -12,7 +12,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
         <tr>
             <th colspan="2">
                 <h4>Ticket Settings</h4>
-                <em>Global ticket settings and options.</em>
+                <em>Global ticket settings and options.&nbsp;<i class="help-tip icon-question-sign" href="#global_ticket_settings_options"></i></em>
             </th>
         </tr>
     </thead>
@@ -22,7 +22,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
                 <input type="radio" name="random_ticket_ids"  value="0" <?php echo !$config['random_ticket_ids']?'checked="checked"':''; ?> />
                 Sequential
                 <input type="radio" name="random_ticket_ids"  value="1" <?php echo $config['random_ticket_ids']?'checked="checked"':''; ?> />
-                Random  <em>(highly recommended)</em>
+                Random  <em>(highly recommended)</em> <i class="help-tip icon-question-sign" href="#ticket_ids"></i>
             </td>
         </tr>
 
@@ -44,7 +44,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
                     }
                     ?>
                 </select>
-                &nbsp;<span class="error">*&nbsp;<?php echo $errors['default_sla_id']; ?></span>
+                &nbsp;<span class="error">*&nbsp;<?php echo $errors['default_sla_id']; ?></span>  <i class="help-tip icon-question-sign" href="#default_sla"></i>
             </td>
         </tr>
         <tr>
@@ -58,36 +58,35 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
                     <?php
                     } ?>
                 </select>
-                &nbsp;<span class="error">*&nbsp;<?php echo $errors['default_priority_id']; ?></span>
+                &nbsp;<span class="error">*&nbsp;<?php echo $errors['default_priority_id']; ?></span> <i class="help-tip icon-question-sign" href="#default_priority"></i>
              </td>
         </tr>
         <tr>
             <td>Maximum <b>Open</b> Tickets:</td>
             <td>
                 <input type="text" name="max_open_tickets" size=4 value="<?php echo $config['max_open_tickets']; ?>">
-                per email/user. <em>(Helps with spam and email flood control - enter 0 for unlimited)</em>
+                per email/user. <i class="help-tip icon-question-sign" href="#maximum_open_tickets"></i>
             </td>
         </tr>
         <tr>
             <td>Ticket Auto-lock Time:</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>
-                <em>(Minutes to lock a ticket on activity - enter 0 to disable locking)</em>
+                <font class="error"><?php echo $errors['autolock_minutes']; ?></font> <i class="help-tip icon-question-sign" href="#ticket_auto_lock_priority"></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/>
+                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>
             </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
+                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 -->
             </td>
@@ -96,21 +95,21 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
             <td>Assigned Tickets:</td>
             <td>
                 <input type="checkbox" name="show_assigned_tickets" <?php echo $config['show_assigned_tickets']?'checked="checked"':''; ?>>
-                Show assigned tickets on open queue.
+                Show assigned tickets on open queue. <i class="help-tip icon-question-sign" href="#assigned_tickets"></i>
             </td>
         </tr>
         <tr>
             <td>Answered Tickets:</td>
             <td>
                 <input type="checkbox" name="show_answered_tickets" <?php echo $config['show_answered_tickets']?'checked="checked"':''; ?>>
-                Show answered tickets on open queue.
+                Show answered tickets on open queue. <i class="help-tip icon-question-sign" href="#answered_tickets"></i>
             </td>
         </tr>
         <tr>
             <td>Staff Identity Masking:</td>
             <td>
                 <input type="checkbox" name="hide_staff_name" <?php echo $config['hide_staff_name']?'checked="checked"':''; ?>>
-                Hide staff's name on responses.
+                Hide staff's name on responses. <i class="help-tip icon-question-sign" href="#staff_identity_masking"></i>
             </td>
         </tr>
         <tr>
@@ -118,7 +117,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
             <td>
                 <input type="checkbox" name="enable_html_thread" <?php
                 echo $config['enable_html_thread']?'checked="checked"':''; ?>>
-                Enable rich text in ticket thread and autoresponse emails
+                Enable rich text in ticket thread and autoresponse emails. <i class="help-tip icon-question-sign" href="#enable_html_ticket_thread"></i>
             </td>
         </tr>
         <tr>
@@ -231,7 +230,7 @@ if(!($maxfileuploads=ini_get('max_file_uploads')))
         <tr>
             <td width="180">Ticket Response Files:</td>
             <td>
-                <input type="checkbox" name="email_attachments" <?php echo $config['email_attachments']?'checked="checked"':''; ?> >Email attachments to the user
+                <input type="checkbox" name="email_attachments" <?php echo $config['email_attachments']?'checked="checked"':''; ?> >Email attachments to the user <i class="help-tip icon-question-sign" href="#ticket_response_files"></i>
             </td>
         </tr>
         <?php if (($bks = FileStorageBackend::allRegistered())
diff --git a/include/staff/slaplan.inc.php b/include/staff/slaplan.inc.php
index 0aac8b778005cc61644f57f39fe77e4d07fcee7c..899e11a0a39356e0bbddd18dea047e319635fe1c 100644
--- a/include/staff/slaplan.inc.php
+++ b/include/staff/slaplan.inc.php
@@ -42,7 +42,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
             <td>
                 <input type="text" size="30" name="name" value="<?php echo $info['name']; ?>">
-                &nbsp;<span class="error">*&nbsp;<?php echo $errors['name']; ?></span>
+                &nbsp;<span class="error">*&nbsp;<?php echo $errors['name']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#name"></i>
             </td>
         </tr>
         <tr>
@@ -52,7 +52,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             <td>
                 <input type="text" size="10" name="grace_period" value="<?php echo $info['grace_period']; ?>">
                 <em>( in hours )</em>
-                &nbsp;<span class="error">*&nbsp;<?php echo $errors['grace_period']; ?></span>
+                &nbsp;<span class="error">*&nbsp;<?php echo $errors['grace_period']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#grace_period"></i>
             </td>
         </tr>
         <tr>
@@ -71,7 +71,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
             <td>
                 <input type="checkbox" name="enable_priority_escalation" value="1" <?php echo $info['enable_priority_escalation']?'checked="checked"':''; ?> >
-                    <strong>Enable</strong> priority escalation on overdue tickets.
+                    <strong>Enable</strong> priority escalation on overdue tickets.&nbsp;<i class="help-tip icon-question-sign" href="#priority_escalation"></i>
             </td>
         </tr>
         <tr>
@@ -81,7 +81,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             <td>
                 <input type="checkbox" name="transient" value="1" <?php echo $info['transient']?'checked="checked"':''; ?> >
                 SLA can be overridden on ticket transfer or help topic
-                change
+                change&nbsp;<i class="help-tip icon-question-sign" href="#transient"></i>
             </td>
         </tr>
         <tr>
@@ -96,7 +96,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <th colspan="2">
-                <em><strong>Admin Notes</strong>: Internal notes.&nbsp;</em>
+                <em><strong>Admin Notes</strong>: Internal notes.&nbsp;&nbsp;<i class="help-tip icon-question-sign" href="#admin_notes"></i></em>
             </th>
         </tr>
         <tr>
diff --git a/include/staff/staff.inc.php b/include/staff/staff.inc.php
index c40b2d56be54bc1c883c73de32c65094c4893bae..126b94e03f783c8789025cc7114b40a984765f59 100644
--- a/include/staff/staff.inc.php
+++ b/include/staff/staff.inc.php
@@ -54,7 +54,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             <td>
                 <input type="text" size="30" class="staff-username typeahead"
                      name="username" value="<?php echo $info['username']; ?>">
-                &nbsp;<span class="error">*&nbsp;<?php echo $errors['username']; ?></span>
+                &nbsp;<span class="error">*&nbsp;<?php echo $errors['username']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#username"></i>
             </td>
         </tr>
 
@@ -65,7 +65,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             <td>
                 <input type="text" size="30" name="firstname" class="auto first"
                      value="<?php echo $info['firstname']; ?>">
-                &nbsp;<span class="error">*&nbsp;<?php echo $errors['firstname']; ?></span>
+                &nbsp;<span class="error">*&nbsp;<?php echo $errors['firstname']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#first_name"></i>
             </td>
         </tr>
         <tr>
@@ -75,7 +75,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             <td>
                 <input type="text" size="30" name="lastname" class="auto last"
                     value="<?php echo $info['lastname']; ?>">
-                &nbsp;<span class="error">*&nbsp;<?php echo $errors['lastname']; ?></span>
+                &nbsp;<span class="error">*&nbsp;<?php echo $errors['lastname']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#last_name"></i>
             </td>
         </tr>
         <tr>
@@ -85,7 +85,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             <td>
                 <input type="text" size="30" name="email" class="auto email"
                     value="<?php echo $info['email']; ?>">
-                &nbsp;<span class="error">*&nbsp;<?php echo $errors['email']; ?></span>
+                &nbsp;<span class="error">*&nbsp;<?php echo $errors['email']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#email_address"></i>
             </td>
         </tr>
         <tr>
@@ -128,7 +128,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
 <?php } ?>
         <tr>
             <th colspan="2">
-                <em><strong>Authentication</strong>: <?php echo $passwd_text; ?> &nbsp;<span class="error">&nbsp;<?php echo $errors['temppasswd']; ?></span></em>
+                <em><strong>Authentication</strong>: <?php echo $passwd_text; ?> &nbsp;<span class="error">&nbsp;<?php echo $errors['temppasswd']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#account_password"></i></em>
             </th>
         </tr>
         <tr>
@@ -180,14 +180,14 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
             <td>
                 <input type="checkbox" name="change_passwd" value="0" <?php echo $info['change_passwd']?'checked="checked"':''; ?>>
-                <strong>Force</strong> password change on next login.
+                <strong>Force</strong> password change on next login.&nbsp;<i class="help-tip icon-question-sign" href="#forced_password_change"></i>
             </td>
         </tr>
     </tbody>
     <tbody>
         <tr>
             <th colspan="2">
-                <em><strong>Staff's Signature</strong>: Optional signature used on outgoing emails. &nbsp;<span class="error">&nbsp;<?php echo $errors['signature']; ?></span></em>
+                <em><strong>Staff's Signature</strong>: Optional signature used on outgoing emails. &nbsp;<span class="error">&nbsp;<?php echo $errors['signature']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#agent_s_signature"></i></em>
             </th>
         </tr>
         <tr>
@@ -199,7 +199,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         </tr>
         <tr>
             <th colspan="2">
-                <em><strong>Account Status & Settings</strong>: Dept. and assigned group controls access permissions.</em>
+                <em><strong>Account Status & Settings</strong>: Dept. and assigned group controls access permissions.&nbsp;<i class="help-tip icon-question-sign" href="#account_status_settings"></i></em>
             </th>
         </tr>
         <tr>
@@ -220,7 +220,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             <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"':''; ?>><strong>Locked</strong>
-                &nbsp;<span class="error">&nbsp;<?php echo $errors['isactive']; ?></span>
+                &nbsp;<span class="error">&nbsp;<?php echo $errors['isactive']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#account_status"></i>
             </td>
         </tr>
         <tr>
@@ -240,7 +240,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     }
                     ?>
                 </select>
-                &nbsp;<span class="error">*&nbsp;<?php echo $errors['group_id']; ?></span>
+                &nbsp;<span class="error">*&nbsp;<?php echo $errors['group_id']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#assigned_group"></i>
             </td>
         </tr>
         <tr>
@@ -260,7 +260,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                     }
                     ?>
                 </select>
-                &nbsp;<span class="error">*&nbsp;<?php echo $errors['dept_id']; ?></span>
+                &nbsp;<span class="error">*&nbsp;<?php echo $errors['dept_id']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#primary_department"></i>
             </td>
         </tr>
         <tr>
@@ -290,7 +290,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             <td>
                 <input type="checkbox" name="daylight_saving" value="1" <?php echo $info['daylight_saving']?'checked="checked"':''; ?>>
                 Observe daylight saving
-                <em>(Current Time: <strong><?php echo Format::date($cfg->getDateTimeFormat(),Misc::gmtime(),$info['tz_offset'],$info['daylight_saving']); ?></strong>)</em>
+                <em>(Current Time: <strong><?php echo Format::date($cfg->getDateTimeFormat(),Misc::gmtime(),$info['tz_offset'],$info['daylight_saving']); ?></strong>)&nbsp;<i class="help-tip icon-question-sign" href="#daylight_saving"></i></em>
             </td>
         </tr>
         <tr>
@@ -298,7 +298,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                 Limited Access:
             </td>
             <td>
-                <input type="checkbox" name="assigned_only" value="1" <?php echo $info['assigned_only']?'checked="checked"':''; ?>>Limit ticket access to ONLY assigned tickets.
+                <input type="checkbox" name="assigned_only" value="1" <?php echo $info['assigned_only']?'checked="checked"':''; ?>>Limit ticket access to ONLY assigned tickets.&nbsp;<i class="help-tip icon-question-sign" href="#limited_access"></i>
             </td>
         </tr>
         <tr>
@@ -306,7 +306,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
                 Directory Listing:
             </td>
             <td>
-                <input type="checkbox" name="isvisible" value="1" <?php echo $info['isvisible']?'checked="checked"':''; ?>>Show the user on staff's directory
+                <input type="checkbox" name="isvisible" value="1" <?php echo $info['isvisible']?'checked="checked"':''; ?>>Show the user on staff's directory&nbsp;<i class="help-tip icon-question-sign" href="#directory_listing"></i>
             </td>
         </tr>
         <tr>
@@ -315,7 +315,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             </td>
             <td>
                 <input type="checkbox" name="onvacation" value="1" <?php echo $info['onvacation']?'checked="checked"':''; ?>>
-                    Staff on vacation mode. (<i>No ticket assignment or alerts</i>)
+                    Staff on vacation mode. (<i>No ticket assignment or alerts</i>)&nbsp;<i class="help-tip icon-question-sign" href="#vacation_mode"></i>
             </td>
         </tr>
         <?php
@@ -336,7 +336,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
         } ?>
         <tr>
             <th colspan="2">
-                <em><strong>Admin Notes</strong>: Internal notes viewable by all admins.&nbsp;</em>
+                <em><strong>Admin Notes</strong>&nbsp;<i class="help-tip icon-question-sign" href="#admin_notes"></i></em>
             </th>
         </tr>
         <tr>
diff --git a/include/staff/template.inc.php b/include/staff/template.inc.php
index 84e7704cd6799a4c598e57243e1bfecbdbe8563d..0da57c3808ce3d948f80e1cf757040cfcdc3d585 100644
--- a/include/staff/template.inc.php
+++ b/include/staff/template.inc.php
@@ -52,7 +52,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
             <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
-                &nbsp;<span class="error">*&nbsp;<?php echo $errors['isactive']; ?></span>
+                &nbsp;<span class="error">*&nbsp;<?php echo $errors['isactive']; ?></span>&nbsp;<i class="help-tip icon-question-sign" href="#status"></i>
             </td>
         </tr>
         <?php
@@ -141,13 +141,13 @@ $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)</em>
+                 <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>
             </td>
         </tr>
         <?php } ?>
         <tr>
             <th colspan="2">
-                <em><strong>Admin Notes</strong>: Internal notes.&nbsp;</em>
+                <em><strong>Admin Notes </strong>: Internal notes.&nbsp;<i class="help-tip icon-question-sign" href="#admin_notes"></i></em>
             </th>
         </tr>
         <tr>
diff --git a/include/staff/tickets.inc.php b/include/staff/tickets.inc.php
index a03ebdbf4d9b237edf1f9b60981f76efa646404d..b63d16a31c4ec0028bf1533614e32e3b3522e579 100644
--- a/include/staff/tickets.inc.php
+++ b/include/staff/tickets.inc.php
@@ -298,7 +298,7 @@ if ($results) {
             <td><input type="text" id="basic-ticket-search" name="query" size=30 value="<?php echo Format::htmlchars($_REQUEST['query']); ?>"
                 autocomplete="off" autocorrect="off" autocapitalize="off"></td>
             <td><input type="submit" name="basic_search" class="button" value="Search"></td>
-            <td>&nbsp;&nbsp;<a href="#" id="go-advanced">[advanced]</a></td>
+            <td>&nbsp;&nbsp;<a href="#" id="go-advanced">[advanced]</a>&nbsp;<i class="help-tip icon-question-sign" href="#advanced"></i></td>
         </tr>
     </table>
     </form>
@@ -466,7 +466,7 @@ if ($results) {
     if($num>0){ //if we actually had any tickets returned.
         echo '<div>&nbsp;Page:'.$pageNav->getPageLinks().'&nbsp;';
         echo '<a class="export-csv no-pjax" href="?a=export&h='
-            .$hash.'&status='.$_REQUEST['status'] .'">Export</a></div>';
+            .$hash.'&status='.$_REQUEST['status'] .'">Export</a>&nbsp;<i class="help-tip icon-question-sign" href="#export"></i></div>';
     ?>
         <?php
          if($thisstaff->canManageTickets()) { ?>
diff --git a/scp/apikeys.php b/scp/apikeys.php
index e729d277dacda99e8654daebb88d99806832b87e..58daf6eeaa32b8518895016de8203c6d8983a08d 100644
--- a/scp/apikeys.php
+++ b/scp/apikeys.php
@@ -94,10 +94,15 @@ if($_POST){
 }
 
 $page='apikeys.inc.php';
-if($api || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
-    $page='apikey.inc.php';
+$tip_namespace = 'manage.api_keys';
+
+if($api || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
+    $page = 'apikey.inc.php';
+    $tip_namespace = 'manage.addnew_api';
+}
 
 $nav->setTabActive('manage');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/banlist.php b/scp/banlist.php
index b517a6f55bf9938bd2c9edb2a17be338a0dd1200..6c1e2611ffbba9904dc73529e6fbe1f75d994181 100644
--- a/scp/banlist.php
+++ b/scp/banlist.php
@@ -120,10 +120,14 @@ if($_POST && !$errors && $filter){
 }
 
 $page='banlist.inc.php';
-if(!$filter || ($rule || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))))
+$tip_namespace = 'emails.banlist';
+if(!$filter || ($rule || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))) {
     $page='banrule.inc.php';
+    $tip_namespace = 'emails.manage_banlist';
+}
 
 $nav->setTabActive('emails');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/canned.php b/scp/canned.php
index 262c5f4893109ca0f4d26b703aaca249645b1a8d..13c6cfbb138193f4150ffdfc7118242865352de4 100644
--- a/scp/canned.php
+++ b/scp/canned.php
@@ -147,10 +147,14 @@ if($_POST && $thisstaff->canManageCannedResponses()) {
 }
 
 $page='cannedresponses.inc.php';
-if($canned || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
+$tip_namespace = 'knowledgebase.canned_responses';
+if($canned || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='cannedresponse.inc.php';
+    $tip_namespace = 'knowledgebase.addnew_canned_response';
+}
 
 $nav->setTabActive('kbase');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/categories.php b/scp/categories.php
index 9598f0da6bb4d6545633e359c82f7dff37e4e768..47877202d1e41fbc1d0017cb87d248c1d687005a 100644
--- a/scp/categories.php
+++ b/scp/categories.php
@@ -104,10 +104,14 @@ if($_POST){
 }
 
 $page='categories.inc.php';
-if($category || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
+$tip_namespace = 'knowledgebase.categories';
+if($category || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='category.inc.php';
+    $tip_namespace = 'knowledgebase.addnew_category';
+}
 
 $nav->setTabActive('kbase');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/css/scp.css b/scp/css/scp.css
index 3d73c45cd2b5fbf3ec04d6dba2185b5104105589..af47a21f731c13eaf2529e2182acb7d3c0168f88 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -1120,6 +1120,15 @@ i.help-tip:hover {
     cursor: pointer;
 }
 
+caption > i.help-tip {
+    color: white;
+}
+
+h2 > i.help-tip {
+    vertical-align: baseline;
+    font-size: 11pt;
+}
+
 /* Knowledgebase */
 /* Knowledgebase */
 #kb {
diff --git a/scp/dashboard.php b/scp/dashboard.php
index 75717dfec0b9232b67a4d34a20da7f272cc49cc0..d9fcfec63e885b9689776f2f9b9838cb74c7bf16 100644
--- a/scp/dashboard.php
+++ b/scp/dashboard.php
@@ -15,6 +15,7 @@
 **********************************************************************/
 require('staff.inc.php');
 $nav->setTabActive('dashboard');
+$ost->addExtraHeader('<meta name="tip-namespace" content="dashboard.dashboard" />');
 require(STAFFINC_DIR.'header.inc.php');
 ?>
 
@@ -28,11 +29,11 @@ require(STAFFINC_DIR.'header.inc.php');
 <link rel="stylesheet" type="text/css" href="css/bootstrap.css"/>
 <link rel="stylesheet" type="text/css" href="css/dashboard.css"/>
 
-<h2>Ticket Activity</h2>
+<h2>Ticket Activity&nbsp;<i class="help-tip icon-question-sign" href="#ticket_activity"></i></h2>
 <p>Select the starting time and period for the system activity graph</p>
 <form class="well form-inline" id="timeframe-form">
     <label>
-        Report timeframe:
+        <i class="help-tip icon-question-sign" href="#report_timeframe"></i>&nbsp;&nbsp;Report timeframe:
         <input type="text" class="dp input-medium search-query"
             name="start" placeholder="Last month"/>
     </label>
@@ -56,7 +57,7 @@ require(STAFFINC_DIR.'header.inc.php');
 </div>
 
 <hr/>
-<h2>Statistics</h2>
+<h2>Statistics&nbsp;<i class="help-tip icon-question-sign" href="#statistics"></i></h2>
 <p>Statistics of tickets organized by department, help topic, and staff.</p>
 <ul class="nav nav-tabs" id="tabular-navigation"></ul>
 
diff --git a/scp/departments.php b/scp/departments.php
index e0fdf4f747b226aa6ca4053e50e0f18f44386300..c6efd1cbf46425346798f6c932642fc9c01370eb 100644
--- a/scp/departments.php
+++ b/scp/departments.php
@@ -103,10 +103,14 @@ if($_POST){
 }
 
 $page='departments.inc.php';
-if($dept || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
+$tip_namespace = 'staff.departments';
+if($dept || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='department.inc.php';
+    $tip_namespace = 'staff.addnew_department';
+}
 
 $nav->setTabActive('staff');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/directory.php b/scp/directory.php
index a87dd0ac07bee43bf0be365592ca07213f174a75..d974bb10d8d1270aec2a6b2446b6f800ab772d28 100644
--- a/scp/directory.php
+++ b/scp/directory.php
@@ -16,6 +16,7 @@
 require('staff.inc.php');
 $page='directory.inc.php';
 $nav->setTabActive('dashboard');
+$ost->addExtraHeader('<meta name="tip-namespace" content="dashboard.staff_directory" />');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/emails.php b/scp/emails.php
index 7a3051ea09fe04e41ff4bcedfd867ae0ac4d06b1..cb2cf35e6d73bf73460e319ee124f19249ebad6f 100644
--- a/scp/emails.php
+++ b/scp/emails.php
@@ -78,11 +78,15 @@ if($_POST){
 }
 
 $page='emails.inc.php';
-if($email || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
+$tip_namespace = 'emails.emails';
+if($email || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='email.inc.php';
+    $tip_namespace = 'emails.addnew_email';
+}
 
 $nav->setTabActive('emails');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
-?>
+?>
\ No newline at end of file
diff --git a/scp/emailtest.php b/scp/emailtest.php
index 83a896020fde2760d30618f23e96c0d17b27618d..266f2ac143c652b35f665c92fa6096b9843d2a53 100644
--- a/scp/emailtest.php
+++ b/scp/emailtest.php
@@ -49,6 +49,7 @@ if($_POST){
 }
 $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
 $nav->setTabActive('emails');
+$ost->addExtraHeader('<meta name="tip-namespace" content="emails.diagnostic" />');
 require(STAFFINC_DIR.'header.inc.php');
 ?>
 <form action="emailtest.php" method="post" id="save">
diff --git a/scp/filters.php b/scp/filters.php
index dacca25cfceaaaf2a1f6cdcb07acab0b41c5d594..5d29e0d5262835dc984552ab416538de280006a8 100644
--- a/scp/filters.php
+++ b/scp/filters.php
@@ -99,10 +99,14 @@ if($_POST){
 }
 
 $page='filters.inc.php';
-if($filter || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
+$tip_namespace = 'manage.ticket_filters';
+if($filter || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='filter.inc.php';
+    $tip_namespace = 'manage.addnew_filter';
+}
 
 $nav->setTabActive('manage');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/groups.php b/scp/groups.php
index 4fb4a7167e7cfdd2c6644a75a8c6edfdda0c4ad9..7a0772319ffd7019a03cf010224824a2fafbdf0d 100644
--- a/scp/groups.php
+++ b/scp/groups.php
@@ -95,11 +95,15 @@ if($_POST){
 }
 
 $page='groups.inc.php';
-if($group || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
+$tip_namespace = 'staff.groups';
+if($group || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='group.inc.php';
+    $tip_namespace = 'staff.addnew_groups';
+}
 
 $nav->setTabActive('staff');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
-?>
+?>
\ No newline at end of file
diff --git a/scp/helptopics.php b/scp/helptopics.php
index 9f34fab9e848a01f36928a266cc6b69d2cb09d09..cd34daf67e4354b01b4e715c23ba6e85bd70dca7 100644
--- a/scp/helptopics.php
+++ b/scp/helptopics.php
@@ -102,10 +102,14 @@ if($_POST){
 }
 
 $page='helptopics.inc.php';
-if($topic || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
+$tip_namespace = 'manage.help_topics';
+if($topic || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='helptopic.inc.php';
+    $tip_namespace = 'manage.addnew_help_topic';
+}
 
 $nav->setTabActive('manage');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/lists.php b/scp/lists.php
index 17f36d18bb2fbe7ca6df5615e50071967e1e03f4..2cd6702347bb49d1181cfffc9026769eeb58f447 100644
--- a/scp/lists.php
+++ b/scp/lists.php
@@ -179,8 +179,10 @@ if($_POST) {
 }
 
 $page='dynamic-lists.inc.php';
-if($list || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
+if($list || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='dynamic-list.inc.php';
+    $ost->addExtraHeader('<meta name="tip-namespace" content="manage.addnew_custom_list" />');
+}
 
 $nav->setTabActive('manage');
 require(STAFFINC_DIR.'header.inc.php');
diff --git a/scp/logs.php b/scp/logs.php
index 09c831545f5744bf9928fa74a03f42d2e8b6322f..782d19c27233e95a41fe5479e631307d28cc722c 100644
--- a/scp/logs.php
+++ b/scp/logs.php
@@ -46,6 +46,7 @@ if($_POST){
 
 $page='syslogs.inc.php';
 $nav->setTabActive('dashboard');
+$ost->addExtraHeader('<meta name="tip-namespace" content="dashboard.system_logs" />');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/pages.php b/scp/pages.php
index 87b260d2371b259162a95b980b610e8d2e035799..d9f0d7e3432faeeeecab1a8d172358a83a621a1e 100644
--- a/scp/pages.php
+++ b/scp/pages.php
@@ -114,10 +114,14 @@ if($_POST) {
 }
 
 $inc='pages.inc.php';
-if($page || $_REQUEST['a']=='add')
+$tip_namespace = 'manage.pages';
+if($page || $_REQUEST['a']=='add') {
     $inc='page.inc.php';
+    $tip_namespace = 'manage.addnew_page';
+}
 
 $nav->setTabActive('manage');
+$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/profile.php b/scp/profile.php
index 31ffecae5556297abe674f0f52dc8f05ecfb313a..7c5715779b50aefd64a408ee86f5e34a291b35c3 100644
--- a/scp/profile.php
+++ b/scp/profile.php
@@ -41,6 +41,7 @@ elseif($thisstaff->onVacation() && !$warn)
 
 $inc='profile.inc.php';
 $nav->setTabActive('dashboard');
+$ost->addExtraHeader('<meta name="tip-namespace" content="dashboard.my_profile" />');
 require_once(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$inc);
 require_once(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/slas.php b/scp/slas.php
index 072b27792f8a8635479f6a4cf50fddbe01fad4eb..947a232ab9a96fbe7ad2725548d3ff2ec7ed5542 100644
--- a/scp/slas.php
+++ b/scp/slas.php
@@ -96,8 +96,10 @@ if($_POST){
 }
 
 $page='slaplans.inc.php';
-if($sla || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
+if($sla || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='slaplan.inc.php';
+    $ost->addExtraHeader('<meta name="tip-namespace" content="manage.addnew_sla_plan" />');
+}
 
 $nav->setTabActive('manage');
 require(STAFFINC_DIR.'header.inc.php');
diff --git a/scp/staff.php b/scp/staff.php
index 9a134e7e6376f9b0f99873b961e7ed44befabc94..85329b7e057fcfeefa51b759c573ed91a6776825 100644
--- a/scp/staff.php
+++ b/scp/staff.php
@@ -97,10 +97,14 @@ if($_POST){
 }
 
 $page='staffmembers.inc.php';
-if($staff || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
+$tip_namespace = 'staff.agents';
+if($staff || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='staff.inc.php';
+    $tip_namespace = 'staff.addnew_staff';
+}
 
 $nav->setTabActive('staff');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/teams.php b/scp/teams.php
index ce877bea58484510c7c1ce5e7b53ce5ca2af4cf1..3e5963db791ae4d12bfaca72e8b34f6f110f61c9 100644
--- a/scp/teams.php
+++ b/scp/teams.php
@@ -93,10 +93,14 @@ if($_POST){
 }
 
 $page='teams.inc.php';
-if($team || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add')))
+$tip_namespace = 'staff.teams';
+if($team || ($_REQUEST['a'] && !strcasecmp($_REQUEST['a'],'add'))) {
     $page='team.inc.php';
+    $tip_namespace = 'staff.team_form';
+}
 
 $nav->setTabActive('staff');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/templates.php b/scp/templates.php
index a475e5dca68d377b2bee15d77806ca302c939071..f2a35acb9a75bb432dc8d23dd14a8a8544ed9c35 100644
--- a/scp/templates.php
+++ b/scp/templates.php
@@ -132,15 +132,18 @@ if($_POST){
 }
 
 $page='templates.inc.php';
+$tip_namespace = 'email.templates';
 if($template && !strcasecmp($_REQUEST['a'],'manage')){
     $page='tpl.inc.php';
 }elseif($template && !strcasecmp($_REQUEST['a'],'implement')){
     $page='tpl.inc.php';
 }elseif($template || !strcasecmp($_REQUEST['a'],'add')){
     $page='template.inc.php';
+    $tip_namespace = 'emails.email_template_form';
 }
 
 $nav->setTabActive('emails');
+$ost->addExtraHeader('<meta name="tip-namespace" content="' . $tip_namespace . '" />');
 require(STAFFINC_DIR.'header.inc.php');
 require(STAFFINC_DIR.$page);
 include(STAFFINC_DIR.'footer.inc.php');
diff --git a/scp/tickets.php b/scp/tickets.php
index 6e55a4938efe3ca7bf7989f572a85e9b04374f2f..aff50785f9fe3a1bf5b71c69f07b709f084b8a1f 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" />');
 require_once(STAFFINC_DIR.'header.inc.php');
 require_once(STAFFINC_DIR.$inc);
 require_once(STAFFINC_DIR.'footer.inc.php');