diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index cce93c1a14..e2c0af0732 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class UsersController < ApplicationController
-  layout "errbit"
+  layout "errbit", except: :index
 
   def index
     @users = policy_scope(User)
diff --git a/app/views/kaminari/_first_page.html.erb b/app/views/kaminari/_first_page.html.erb
index b40a23dcb6..1ca96283ad 100644
--- a/app/views/kaminari/_first_page.html.erb
+++ b/app/views/kaminari/_first_page.html.erb
@@ -6,6 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="first">
-  <%= link_to_unless current_page.first?, t("views.pagination.first").html_safe, url, remote: remote %>
-</span>
+<li class="page-item">
+  <%= link_to_unless current_page.first?, t("views.pagination.first").html_safe, url, remote: remote, class: "page-link" %>
+</li>
diff --git a/app/views/kaminari/_gap.html.erb b/app/views/kaminari/_gap.html.erb
index 9ed07ace0a..7dfc7effe5 100644
--- a/app/views/kaminari/_gap.html.erb
+++ b/app/views/kaminari/_gap.html.erb
@@ -5,4 +5,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="page gap"><%= t("views.pagination.truncate").html_safe %></span>
+<li class="page-item disabled">
+  <%= link_to t("views.pagination.truncate").html_safe, "#", class: "page-link" %>
+</li>
diff --git a/app/views/kaminari/_last_page.html.erb b/app/views/kaminari/_last_page.html.erb
index 7cdc9a4759..9e919d352e 100644
--- a/app/views/kaminari/_last_page.html.erb
+++ b/app/views/kaminari/_last_page.html.erb
@@ -6,6 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="last">
-  <%= link_to_unless current_page.last?, t("views.pagination.last").html_safe, url, remote: remote %>
-</span>
+<li class="page-item">
+  <%= link_to_unless current_page.last?, t("views.pagination.last").html_safe, url, remote: remote, class: "page-link" %>
+</li>
diff --git a/app/views/kaminari/_next_page.html.erb b/app/views/kaminari/_next_page.html.erb
index c87d1fce50..8e824edc3b 100644
--- a/app/views/kaminari/_next_page.html.erb
+++ b/app/views/kaminari/_next_page.html.erb
@@ -6,6 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="next">
-  <%= link_to_unless current_page.last?, t("views.pagination.next").html_safe, url, rel: "next", remote: remote %>
-</span>
+<li class="page-item">
+  <%= link_to_unless current_page.last?, t("views.pagination.next").html_safe, url, rel: "next", remote: remote, class: "page-link" %>
+</li>
diff --git a/app/views/kaminari/_page.html.erb b/app/views/kaminari/_page.html.erb
index 0d4d131254..affd17cfae 100644
--- a/app/views/kaminari/_page.html.erb
+++ b/app/views/kaminari/_page.html.erb
@@ -7,6 +7,12 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="page<%= " current" if page.current? %>">
-  <%= link_to_unless page.current?, page, url, {remote: remote, rel: page.rel} %>
-</span>
+<% if page.current? %>
+  <li class="page-item active">
+    <%= content_tag :a, page, data: { remote: remote }, rel: page.rel, class: "page-link" %>
+  </li>
+<% else %>
+  <li class="page-item">
+    <%= link_to page, url, remote: remote, rel: page.rel, class: "page-link" %>
+  </li>
+<% end %>
diff --git a/app/views/kaminari/_paginator.html.erb b/app/views/kaminari/_paginator.html.erb
index 5525f48f4a..d8eb927e94 100644
--- a/app/views/kaminari/_paginator.html.erb
+++ b/app/views/kaminari/_paginator.html.erb
@@ -6,20 +6,20 @@
     remote:        data-remote
     paginator:     the paginator that renders the pagination tags inside
 -%>
-<%= paginator.render do -%>
-  <nav class="pagination" role="navigation" aria-label="pager">
-    <%= first_page_tag unless current_page.first? %>
-    <%= prev_page_tag unless current_page.first? %>
-    <% each_page do |page| -%>
-      <% if page.display_tag? -%>
-        <%= page_tag page %>
-      <% elsif !page.was_truncated? -%>
-        <%= gap_tag %>
-      <% end -%>
-    <% end -%>
-    <% unless current_page.out_of_range? %>
+<%= paginator.render do %>
+  <nav>
+    <ul class="pagination">
+      <%= first_page_tag unless current_page.first? %>
+      <%= prev_page_tag unless current_page.first? %>
+      <% each_page do |page| %>
+        <% if page.left_outer? || page.right_outer? || page.inside_window? %>
+          <%= page_tag page %>
+        <% elsif !page.was_truncated? -%>
+          <%= gap_tag %>
+        <% end %>
+      <% end %>
       <%= next_page_tag unless current_page.last? %>
       <%= last_page_tag unless current_page.last? %>
-    <% end %>
+    </ul>
   </nav>
-<% end -%>
+<% end %>
diff --git a/app/views/kaminari/_prev_page.html.erb b/app/views/kaminari/_prev_page.html.erb
index faf2c4585c..8ae2acf703 100644
--- a/app/views/kaminari/_prev_page.html.erb
+++ b/app/views/kaminari/_prev_page.html.erb
@@ -6,6 +6,6 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<span class="prev">
-  <%= link_to_unless current_page.first?, t("views.pagination.previous").html_safe, url, rel: "prev", remote: remote %>
-</span>
+<li class="page-item">
+  <%= link_to_unless current_page.first?, t("views.pagination.previous").html_safe, url, rel: "prev", remote: remote, class: "page-link" %>
+</li>
diff --git a/app/views/users/index.html.erb b/app/views/users/index.html.erb
index 472964bc7e..e0566527d8 100644
--- a/app/views/users/index.html.erb
+++ b/app/views/users/index.html.erb
@@ -9,36 +9,47 @@
   </span>
 <% end %>
 
-<table class="users">
-  <thead>
-    <tr>
-      <% if Errbit::Config.use_gravatar %>
-        <th>&nbsp;</th>
-      <% end %>
-      <th><%= t(".name") %></th>
-      <% if Errbit::Config.user_has_username %>
-        <th><%= t(".username") %></th>
-      <% end %>
-      <th class="main"><%= t(".email") %></th>
-      <th><%= t(".admin") %></th>
-    </tr>
-  </thead>
+<div class="row">
+  <div class="col">
 
-  <tbody>
-    <% @users.each do |user| %>
-      <tr class="user_list">
-        <% if Errbit::Config.use_gravatar %>
-          <td><%= gravatar_tag(user.email, s: 24) %></td>
-        <% end %>
-        <td class="nowrap"><%= link_to user.name, user_path(user) %></td>
-        <% if Errbit::Config.user_has_username %>
-          <td><%= user.username %></td>
+    <table class="table table-striped table-hover table-bordered">
+      <thead>
+        <tr>
+          <% if Errbit::Config.use_gravatar %>
+            <th>&nbsp;</th>
+          <% end %>
+          <th><%= t(".name") %></th>
+          <% if Errbit::Config.user_has_username %>
+            <th><%= t(".username") %></th>
+          <% end %>
+          <th><%= t(".email") %></th>
+          <th><%= t(".admin") %></th>
+        </tr>
+      </thead>
+
+      <tbody>
+        <% @users.each do |user| %>
+          <tr>
+            <% if Errbit::Config.use_gravatar %>
+              <td><%= gravatar_tag(user.email, s: 24) %></td>
+            <% end %>
+            <td><%= link_to user.name, user_path(user) %></td>
+            <% if Errbit::Config.user_has_username %>
+              <td><%= user.username %></td>
+            <% end %>
+            <td><%= user.email %></td>
+            <td><%= user.admin? ? t(".admin_yes") : t(".admin_no") %></td>
+          </tr>
         <% end %>
-        <td><%= user.email %></td>
-        <td><%= user.admin? ? t(".admin_yes") : t(".admin_no") %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+      </tbody>
+    </table>
+
+  </div>
+</div>
+
 
-<%= paginate @users %>
+<div class="row">
+  <div class="col">
+    <%= paginate @users %>
+  </div>
+</div>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 94453787c8..fe4e18c565 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -54,6 +54,10 @@ en:
       title: "Errbit"
       errbit: "Errbit"
       powered_html: "Powered by %{link} : the open source error catcher."
+    errbit: # TODO: remove after porting to Bootstrap 5
+      title: "Errbit"
+      errbit: "Errbit"
+      powered_html: "Powered by %{link} : the open source error catcher."
 
   shared:
     navigation: