diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss b/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss
index 3f617e411b..7f3e063b8a 100644
--- a/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss
+++ b/koha-tmpl/intranet-tmpl/prog/css/src/_mixins.scss
@@ -10,7 +10,7 @@ $nav-menu-bullet: url( "data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/
     margin-bottom: 1rem;
     padding: 1rem;
 
-    &:not( .bg-danger, .bg-warning, .bg-info, .bg-success, .bg-primary, .action ) {
+    &:not( .bg-danger, .bg-warning, .bg-info, .bg-success, .bg-primary, .bg-danger-subtle, .bg-warning-subtle, .bg-info-subtle, .bg-success-subtle, .bg-primary-subtle, .action ) {
         background-color: #FFF;
     }
 }
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
index 851a9d4073..a9558a5578 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
@@ -53,7 +53,7 @@
                     [% END %]
                 </h1>
 
-                <div class="page-section bg-info">
+                <div class="page-section bg-info-subtle">
                     <p>The rules are applied from most specific to less specific, using the first found in this order:</p>
                     <ul>
                         <li>same library, same patron category, same item type</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt
index a0af6dd4e9..12abf1210e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities-home.tt
@@ -33,7 +33,7 @@
 
             <h1>Authorities</h1>
 
-            <div id="merge_in_progress" class="page-section bg-info" style="display:none;"></div>
+            <div id="merge_in_progress" class="alert alert-info" style="display:none;"></div>
 
             [%- SET StaffAuthoritiesHome = AdditionalContents.get( location => "StaffAuthoritiesHome", lang => lang, library => Branches.GetLoggedInBranchcode ) -%]
             [%- FOREACH block IN StaffAuthoritiesHome.content -%]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
index 2461371da0..3d9ee768ac 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt
@@ -47,7 +47,7 @@
     [% INCLUDE 'authorities-toolbar.inc' %]
 <h1>Authority search results</h1>
 
-<div id="merge_in_progress" class="page-section bg-info" style="display:none;"></div>
+<div id="merge_in_progress" class="alert alert-info" style="display:none;"></div>
 <div class="page-section">
     [% IF ( query_error ) %]
         <div class="alert alert-warning"><p><strong>Error:</strong> [% query_error | html %]</p></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
index 6ea7666f9f..7ee2bbe3bb 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
@@ -104,7 +104,7 @@
                         <div id="catalogue_detail_biblio" class="col">
 
                         [% IF decoding_error || analytics_error %]
-                            <div class="page-section bg-danger">
+                            <div class="alert alert-warning">
                                 <h1>Errors found</h1>
                                 [% IF decoding_error %]
                                     <h2>Encoding errors</h2>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
index 899921434c..18462105a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -824,7 +824,7 @@ $(document).ready(function(){
             <div class="col-md-10 offset-md-1">
                 [% INCLUDE 'messages.inc' %]
                 [% IF ( INVALID_METADATA ) %]
-                    <div class="page-section bg-danger">
+                    <div class="alert alert-warning">
                         <h1>Errors found</h1>
                         <p><strong>This record had encoding issues, non-xml characters have been stripped in order to allow editing. Please be cautious when saving that some data may have been removed from the record.</strong></p>
                         <pre class="problem">[% INVALID_METADATA | html %]</pre>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
index 74435bfe9e..456117a65d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/import_borrowers.tt
@@ -396,7 +396,7 @@
 </div>
 
 <div class="col-sm-6">
-    <div class="page-section bg-info">
+    <div class="page-section bg-info-subtle">
         <h2>Notes:</h2>
         <ul>
             <li>The first line in the file must be a header row defining which columns you are supplying in the import file.</li>