diff --git a/pagure/static/pagure.css b/pagure/static/pagure.css
index bb16710..9ac23d0 100644
--- a/pagure/static/pagure.css
+++ b/pagure/static/pagure.css
@@ -35,13 +35,6 @@ h6, .h6 {
   white-space: nowrap;
 }
 
-.repo-header
-{
-    background:#f3f3f3;
-    border-bottom:1px solid #DDD;
-}
-
-
 .notification-spacer
 {
     background:#f3f3f3;
diff --git a/pagure/templates/group_info.html b/pagure/templates/group_info.html
index 078798d..40fa3d1 100644
--- a/pagure/templates/group_info.html
+++ b/pagure/templates/group_info.html
@@ -11,7 +11,7 @@
 {% endblock %}
 
 {% block content %}
-<div class="repo-header pt-2">
+<div class="bg-light border border-top-0 pt-2">
   <div class="container">
         {{browse_header(select=tag)}}
   </div>
diff --git a/pagure/templates/group_list.html b/pagure/templates/group_list.html
index f857b9b..b9f381f 100644
--- a/pagure/templates/group_list.html
+++ b/pagure/templates/group_list.html
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block content %}
-<div class="repo-header pt-2">
+<div class="bg-light border border-top-0 pt-2">
   <div class="container">
         {{browse_header(select=tag)}}
   </div>
diff --git a/pagure/templates/index.html b/pagure/templates/index.html
index 733ffd4..8c3b8bb 100644
--- a/pagure/templates/index.html
+++ b/pagure/templates/index.html
@@ -13,7 +13,7 @@
 {% endblock %}
 
 {% block content %}
-<div class="repo-header pt-2">
+<div class="bg-light border border-top-0 pt-2">
   <div class="container">
     {{ browse_header(select=select) }}
   </div>
diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html
index bb7c547..d8cc539 100644
--- a/pagure/templates/repo_master.html
+++ b/pagure/templates/repo_master.html
@@ -24,7 +24,7 @@
 {% set tag = "home" %}
 
 {% block content %}
-<div class="repo-header pt-3">
+<div class="bg-light border border-top-0 pt-3">
   <div class="container">
     <div class="row mb-3">
       <div class="col-6">
diff --git a/pagure/templates/user_info.html b/pagure/templates/user_info.html
index 692d142..ec5849b 100644
--- a/pagure/templates/user_info.html
+++ b/pagure/templates/user_info.html
@@ -15,7 +15,7 @@
 
 
 {% block content %}
-<div class="repo-header pt-2">
+<div class="bg-light border border-top-0 pt-2">
   <div class="container">
     {{browse_header(select=tag)}}
   </div>
diff --git a/pagure/templates/user_list.html b/pagure/templates/user_list.html
index ea723bb..c172a35 100644
--- a/pagure/templates/user_list.html
+++ b/pagure/templates/user_list.html
@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block content %}
-<div class="repo-header pt-2">
+<div class="bg-light border border-top-0 pt-2">
   <div class="container">
     {{browse_header(select=select)}}
   </div>