diff --git a/africanlii/templates/africanlii/au_detail_page.html b/africanlii/templates/africanlii/au_detail_page.html
index b0d73106d..cc2315373 100644
--- a/africanlii/templates/africanlii/au_detail_page.html
+++ b/africanlii/templates/africanlii/au_detail_page.html
@@ -8,7 +8,7 @@
     <div class="container">
       {% block breadcrumbs %}{% endblock %}
       {% block page-heading %}
-        <h1 class="my-4 heading-underlined">{% trans 'African Union (AU)' %}</h1>
+        <h1 class="my-4">{% trans 'African Union (AU)' %}</h1>
         {% include "peachjam/_help_button.html" with link="african-union-documents-au" %}
       {% endblock %}
       <p>
@@ -36,7 +36,7 @@ <h1 class="my-4 heading-underlined">{% trans 'African Union (AU)' %}</h1>
   <section class="container">
     <div class="row">
       <div class="col-lg-6">
-        <h3 class="mb-4 heading-underlined" id="au-organs">{% trans 'African Union Organs' %}</h3>
+        <h3 class="mb-4" id="au-organs">{% trans 'African Union Organs' %}</h3>
         <ul class="list-unstyled">
           {% for au_organ in au_organs %}
             <li>
@@ -46,7 +46,7 @@ <h3 class="mb-4 heading-underlined" id="au-organs">{% trans 'African Union Organ
         </ul>
       </div>
       <div class="col-lg-6">
-        <h3 class="mb-4 heading-underlined" id="rec">{% trans 'Regional Economic Communities' %}</h3>
+        <h3 class="mb-4" id="rec">{% trans 'Regional Economic Communities' %}</h3>
         <ul class="list-unstyled">
           {% for rec in recs %}
             <li>
@@ -58,7 +58,7 @@ <h3 class="mb-4 heading-underlined" id="rec">{% trans 'Regional Economic Communi
     </div>
     <div class="row">
       <div class="col-lg-6">
-        <h3 class="mb-4 heading-underlined" id="au-institutions">{% trans 'African Union Institutions' %}</h3>
+        <h3 class="mb-4" id="au-institutions">{% trans 'African Union Institutions' %}</h3>
         <ul class="list-unstyled">
           {% for au_institution in au_institutions %}
             <li>
@@ -76,7 +76,7 @@ <h3 class="mb-4 heading-underlined" id="au-institutions">{% trans 'African Union
   </section>
   <section class="container">
     <div class="row">
-      <h3 class="mb-4 heading-underlined" id="member-states">{% trans 'Member States' %}</h3>
+      <h3 class="mb-4" id="member-states">{% trans 'Member States' %}</h3>
       {% for member_state in member_states %}
         <div class="col-6 col-md-4 col-lg-3">
           <div class="card lii-card mb-3">
diff --git a/africanlii/templates/peachjam/home.html b/africanlii/templates/peachjam/home.html
index 86cb31eb5..84c4a2f0c 100644
--- a/africanlii/templates/peachjam/home.html
+++ b/africanlii/templates/peachjam/home.html
@@ -121,24 +121,24 @@ <h3>{% trans 'Member States' %}</h3>
     <div class="container">
       <div class="row">
         <div class="col-lg-6 mb-3">
-          <h3 class="mb-4 heading-underlined">{% trans 'Recent Judgments' %}</h3>
+          <h3 class="mb-4">{% trans 'Recent Judgments' %}</h3>
           {% trans 'View more judgments' as text %}
           {% include 'peachjam/_recent_document_list.html' with documents=recent_judgments view_more_text=text view_more_url_name='judgment_list' %}
         </div>
         <div class="col-lg-6 mb-3">
-          <h3 class="mb-4 heading-underlined">{% trans 'Recent Legal Instruments' %}</h3>
+          <h3 class="mb-4">{% trans 'Recent Legal Instruments' %}</h3>
           {% trans 'View more legal instruments' as text %}
           {% include 'peachjam/_recent_document_list.html' with documents=recent_legal_instruments view_more_text=text view_more_url_name='agp_legal_instrument_list' %}
         </div>
       </div>
       <div class="row">
         <div class="col-lg-6 mb-3">
-          <h3 class="mb-4 heading-underlined">{% trans 'Recent Soft Law' %}</h3>
+          <h3 class="mb-4">{% trans 'Recent Soft Law' %}</h3>
           {% trans 'View more Soft Law' as text %}
           {% include 'peachjam/_recent_document_list.html' with documents=recent_soft_law view_more_text=text view_more_url_name='agp_soft_law_list' %}
         </div>
         <div class="col-lg-6 mb-3">
-          <h2 class="mb-4 heading-underlined">{% trans 'Recent Reports and Guides' %}</h2>
+          <h2 class="mb-4">{% trans 'Recent Reports and Guides' %}</h2>
           {% trans 'View more Reports and Guides' as text %}
           {% include 'peachjam/_recent_document_list.html' with documents=recent_reports_guides view_more_text=text view_more_url_name='agp_reports_guides_list' %}
         </div>
@@ -186,7 +186,7 @@ <h5 class="card-title">{{ lii.country }}</h5>
   </section>
   <section class="py-5">
     <div class="container">
-      <h2 class="mb-4 heading-underlined">
+      <h2 class="mb-4">
         {% trans 'Latest Commentary' %}
       </h2>
       {% include 'peachjam/_article_list.html' with articles=recent_articles %}
@@ -195,7 +195,7 @@ <h2 class="mb-4 heading-underlined">
   </section>
   <section class="py-5">
     <div class="container">
-      <h2 class="mb-4 heading-underlined">
+      <h2 class="mb-4">
         {% trans 'Collections' %}
       </h2>
       {% include 'peachjam/_taxonomy_list.html' %}
diff --git a/lawlibrary/templates/lawlibrary/home.html b/lawlibrary/templates/lawlibrary/home.html
index 2d9d82b03..acec95779 100644
--- a/lawlibrary/templates/lawlibrary/home.html
+++ b/lawlibrary/templates/lawlibrary/home.html
@@ -22,12 +22,12 @@ <h4 class="mb-4">
 {% endblock %}
 {% block first-column-content %}
   <section class="pb-3 pt-3">
-    <h2 class="mb-4 heading-underlined">{% trans 'Recent Judgments' %}</h2>
+    <h2 class="mb-4">{% trans 'Recent Judgments' %}</h2>
     {% trans 'View more judgments' as text %}
     {% include 'peachjam/_recent_document_list.html' with documents=recent_judgments view_more_text=text view_more_url_name='judgment_list' %}
   </section>
   <section class="pb-3 pt-3">
-    <h2 class="mb-4 heading-underlined">{% trans 'Recent Legislation' %}</h2>
+    <h2 class="mb-4">{% trans 'Recent Legislation' %}</h2>
     {% trans 'View more legislation' as text %}
     {% include 'peachjam/_recent_document_list.html' with documents=recent_legislation view_more_text=text view_more_url_name='legislation_list' %}
   </section>
diff --git a/liiweb/templates/liiweb/home.html b/liiweb/templates/liiweb/home.html
index 009a866ca..5759725b6 100644
--- a/liiweb/templates/liiweb/home.html
+++ b/liiweb/templates/liiweb/home.html
@@ -81,12 +81,12 @@
       <div>
         {% block first-column-content %}
           <section class="pb-3 pt-3">
-            <h2 class="mb-4 heading-underlined">{% trans 'Recent Judgments' %}</h2>
+            <h2 class="mb-4">{% trans 'Recent Judgments' %}</h2>
             {% trans 'View more judgments' as text %}
             {% include 'peachjam/_recent_document_list.html' with documents=recent_judgments view_more_text=text view_more_url_name='judgment_list' %}
           </section>
           <section class="pb-3 pt-3">
-            <h2 class="mb-4 heading-underlined">{% trans 'Recent Legislation' %}</h2>
+            <h2 class="mb-4">{% trans 'Recent Legislation' %}</h2>
             {% trans 'View more legislation' as text %}
             {% include 'peachjam/_recent_document_list.html' with documents=recent_legislation view_more_text=text view_more_url_name='legislation_list' %}
           </section>
@@ -95,11 +95,11 @@ <h2 class="mb-4 heading-underlined">{% trans 'Recent Legislation' %}</h2>
       <div>
         {% block lower-row-content %}
           <section class="pb-3 pt-3">
-            <h2 class="mb-4 heading-underlined">{% trans 'Courts' %}</h2>
+            <h2 class="mb-4">{% trans 'Courts' %}</h2>
             {% include 'peachjam/_court_list.html' %}
           </section>
           <section class="pb-3 pt-3">
-            <h2 class="mb-4 heading-underlined">{% trans 'Collections' %}</h2>
+            <h2 class="mb-4">{% trans 'Collections' %}</h2>
             {% include 'peachjam/_taxonomy_list.html' %}
           </section>
           {% if PEACHJAM_SETTINGS.pocket_law_repo %}
@@ -126,7 +126,7 @@ <h2 class="mb-4">{% blocktrans trimmed %}Use {{ APP_NAME }} when you're offline{
           {% endif %}
           {% if recent_articles %}
             <section class="pb-5 pt-5">
-              <h2 class="mb-4 heading-underlined">{% trans 'Latest Articles' %}</h2>
+              <h2 class="mb-4">{% trans 'Latest Articles' %}</h2>
               {% include 'peachjam/_article_list.html' with articles=recent_articles %}
               <a class="mt-3 btn btn-primary" href="{% url 'article_list' %}">{% trans "View more articles" %}</a>
             </section>
diff --git a/peachjam/static/stylesheets/_global.scss b/peachjam/static/stylesheets/_global.scss
index 63d790f26..5333f20c4 100644
--- a/peachjam/static/stylesheets/_global.scss
+++ b/peachjam/static/stylesheets/_global.scss
@@ -18,12 +18,6 @@ main {
   flex-grow: 1;
 }
 
-.heading-underlined {
-  border-bottom: 1px solid $primary;
-  padding-top: 5px;
-  padding-bottom: 5px;
-}
-
 .courts__column-wrapper {
   columns: 3 auto;
 
diff --git a/peachjam/templates/peachjam/_court_list.html b/peachjam/templates/peachjam/_court_list.html
index 280502b1d..ae64bb421 100644
--- a/peachjam/templates/peachjam/_court_list.html
+++ b/peachjam/templates/peachjam/_court_list.html
@@ -3,7 +3,7 @@
   <div class="courts__column-wrapper mb-3">
     {% for court_class in court_classes %}
       <div class="courts__item mb-3">
-        <h4 class="heading-underlined">{{ court_class }}</h4>
+        <h4 class="mb-2">{{ court_class }}</h4>
         {% if court_class.courts.all %}
           <ul class="list-unstyled">
             {% for court in court_class.courts.all %}
diff --git a/peachjam/templates/peachjam/judgment_list.html b/peachjam/templates/peachjam/judgment_list.html
index c694cad26..c83d6ac99 100644
--- a/peachjam/templates/peachjam/judgment_list.html
+++ b/peachjam/templates/peachjam/judgment_list.html
@@ -9,7 +9,7 @@
       <h1 class="my-4">{% trans 'Judgments' %}</h1>
       {% include "peachjam/_help_button.html" with link="judgments/courts" %}
       {% include 'peachjam/_court_list.html' %}
-      <h4 class="heading-underlined">
+      <h4 class="mb-2 mt-4">
         {% if title %}
           {{ title }}
         {% else %}