diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 9222aafff..b2b3e913a 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -11,14 +11,14 @@
                      options_for_select(Issue.aasm.states.map(&:name).map { |state| [t(".states.#{state}"), state] }, params[:status]),
                      :include_blank => t(".select_status"),
                      :data => { :behavior => "category_dropdown" },
-                     :class => "form-control custom-select" %>
+                     :class => "form-select" %>
     </div>
     <div class="form-group col-md-auto">
       <%= select_tag :issue_type,
                      options_for_select(@issue_types, params[:issue_type]),
                      :include_blank => t(".select_type"),
                      :data => { :behavior => "category_dropdown" },
-                     :class => "form-control custom-select" %>
+                     :class => "form-select" %>
     </div>
     <div class="form-group col-md">
       <%= text_field_tag :search_by_user,
@@ -32,7 +32,7 @@
                      options_for_select(@users.all.collect { |f| [f.display_name, f.id] } << [t(".not_updated"), "nil"], params[:last_updated_by]),
                      :include_blank => t(".select_last_updated_by"),
                      :data => { :behavior => "category_dropdown" },
-                     :class => "form-control custom-select" %>
+                     :class => "form-select" %>
     </div>
     <div class="form-group col-md-auto">
       <%= submit_tag t(".search"), :name => nil, :class => "btn btn-primary" %>
diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index 38a926760..c2501b95b 100644
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -39,7 +39,7 @@
     </div>
     <div class="row gx-2 m-1">
       <div class="col offset-1">
-        <select class="routing_engines form-control form-control-sm" name="routing_engines"></select>
+        <select class="routing_engines form-select form-select-sm" name="routing_engines"></select>
       </div>
       <div class="col-auto">
         <%= submit_tag t("site.search.submit_text"), :class => "routing_go btn btn-sm btn-primary", :data => { :disable_with => false } %>
diff --git a/app/views/user_blocks/edit.html.erb b/app/views/user_blocks/edit.html.erb
index 8c89c80f3..3591b9c0f 100644
--- a/app/views/user_blocks/edit.html.erb
+++ b/app/views/user_blocks/edit.html.erb
@@ -16,7 +16,9 @@
 
   <%= f.form_group do %>
     <%= label_tag "user_block_period", t(".period") %><br />
-    <%= select_tag("user_block_period", options_for_select(UserBlock::PERIODS.collect { |h| [block_duration_in_words(h.hours), h.to_s] }, params[:user_block_period])) %>
+    <%= select_tag("user_block_period",
+                   options_for_select(UserBlock::PERIODS.collect { |h| [block_duration_in_words(h.hours), h.to_s] }, params[:user_block_period]),
+                   :class => "form-select") %>
   <% end %>
 
   <%= f.form_group :needs_view do %>
diff --git a/app/views/user_blocks/new.html.erb b/app/views/user_blocks/new.html.erb
index 4dc7fd63c..c1195343b 100644
--- a/app/views/user_blocks/new.html.erb
+++ b/app/views/user_blocks/new.html.erb
@@ -10,7 +10,9 @@
 
   <%= f.form_group do %>
     <%= label_tag "user_block_period", t(".period") %><br />
-    <%= select_tag("user_block_period", options_for_select(UserBlock::PERIODS.collect { |h| [block_duration_in_words(h.hours), h.to_s] }, params[:user_block_period])) %>
+    <%= select_tag("user_block_period",
+                   options_for_select(UserBlock::PERIODS.collect { |h| [block_duration_in_words(h.hours), h.to_s] }, params[:user_block_period]),
+                   :class => "form-select") %>
   <% end %>
 
   <%= f.form_group :needs_view do %>