diff --git a/local/languages/finna/ReservationList/en-gb.ini b/local/languages/finna/ReservationList/en-gb.ini
index 367d6a55b3e..de8eb3d97e0 100644
--- a/local/languages/finna/ReservationList/en-gb.ini
+++ b/local/languages/finna/ReservationList/en-gb.ini
@@ -22,7 +22,7 @@ Order List = "Order list"
 Reservation Lists = "Reservation Lists"
 Reservation List = "Reservation List"
 Reserve to Research Room = "Reserve to research room"
-request_post_info_html = '<div class="alert-danger" style="padding: 2px"><b>NOTE:</b> You cannot add materials to the reservation after it has been sent. The reservation is saved to your account.</div>'
+request_post_info_html = '<div class="alert alert-danger" style="padding: 2px"><b>NOTE:</b> You cannot add materials to the reservation after it has been sent. The reservation is saved to your account.</div>'
 request_pre_info_html = ""
 Reservation List Name = "Reservation lists name"
 Send Reservation Request = "Send reservation request"
diff --git a/local/languages/finna/ReservationList/fi.ini b/local/languages/finna/ReservationList/fi.ini
index 17335babf8f..afa81b84576 100644
--- a/local/languages/finna/ReservationList/fi.ini
+++ b/local/languages/finna/ReservationList/fi.ini
@@ -22,7 +22,7 @@ Order List = "Tilaa lista"
 Reservation Lists = "Varauslistat"
 Reservation List = "Varauslista"
 Reserve to Research Room = "Varaa luku- tai tutkijasaliin"
-request_post_info_html = '<div class="alert-info" style="padding: 2px"><b>Huomioithan</b> ettet voi lisätä varaukseen aineistoja lähetyksen jälkeen. Varaus jää talteen Omaan tiliisi.</div>'
+request_post_info_html = '<div class="alert alert-info" style="padding: 2px"><b>Huomioithan</b> ettet voi lisätä varaukseen aineistoja lähetyksen jälkeen. Varaus jää talteen Omaan tiliisi.</div>'
 request_pre_info_html = ""
 Reservation List Name = "Varauslistan nimi"
 Send Reservation Request = "Lähetä varauspyyntö"
diff --git a/local/languages/finna/ReservationList/sv.ini b/local/languages/finna/ReservationList/sv.ini
index 70c81aa8a42..ef1439124e7 100644
--- a/local/languages/finna/ReservationList/sv.ini
+++ b/local/languages/finna/ReservationList/sv.ini
@@ -22,7 +22,7 @@ Order List = "Boka listan"
 Reservation Lists = "Bokningslistor"
 Reservation List = "Bokningslista"
 Reserve to Research Room = "Boka till forskarsal"
-request_post_info_html = '<div class="alert-danger" style="padding: 2px"><b>OBS:</b> Du kan inte lägga till material i bokningen efter att den har skickats. Bokningen sparas på ditt konto.</div>'
+request_post_info_html = '<div class="alert alert-danger" style="padding: 2px"><b>OBS:</b> Du kan inte lägga till material i bokningen efter att den har skickats. Bokningen sparas på ditt konto.</div>'
 request_pre_info_html = ""
 Reservation List Name = "Namn för bokningslista"
 Send Reservation Request = "Skicka bokningsförfrågan"
diff --git a/themes/finna2/scss/finna/common.scss b/themes/finna2/scss/finna/common.scss
index 982b50b9c19..6b564933bdd 100644
--- a/themes/finna2/scss/finna/common.scss
+++ b/themes/finna2/scss/finna/common.scss
@@ -380,6 +380,9 @@ ol {
 .btn-unstyled {
   border: none;
   background-color: transparent;
+  &:hover, .btn-group.open & {
+    box-shadow: none;
+  }
 }
 
 // A general-purpose flexbox layout mixin for switching between a horizontal
diff --git a/themes/finna2/templates/Helpers/reservationlist-reserve.phtml b/themes/finna2/templates/Helpers/reservationlist-reserve.phtml
index 721ec49a843..2399534c625 100644
--- a/themes/finna2/templates/Helpers/reservationlist-reserve.phtml
+++ b/themes/finna2/templates/Helpers/reservationlist-reserve.phtml
@@ -32,7 +32,7 @@ return;
   <?php endforeach; ?>
   <?php if ($listsContainingRecord = $this->reservationList($user)->getListsContainingRecord($this->driver)): ?>
     <div class="holdings-group saved-reservation-lists">
-      <div class="alert-info savedLists loaded">
+      <div class="alert alert-info savedLists loaded">
         <strong><?=$this->transEsc('Saved in')?>:</strong><br/>
         <ul>
           <?php foreach ($listsContainingRecord as $list): ?>
diff --git a/themes/finna2/templates/librarycards/home.phtml b/themes/finna2/templates/librarycards/home.phtml
index 656b82b9a2f..8b1b3a3861c 100644
--- a/themes/finna2/templates/librarycards/home.phtml
+++ b/themes/finna2/templates/librarycards/home.phtml
@@ -51,7 +51,7 @@
                   <span>
                     <?=$this->transEsc('Library Card name missing')?>
                     <?php if ($this->auth()->getManager()->allowsUserIlsLogin()): ?>
-                      <a class="btn-link" href="<?=$this->url('editLibraryCard') . $this->escapeHtmlAttr($record['id']) ?>" title="<?=$this->transEsc('Edit Library Card')?>"> <?=$this->transEsc('Add name')?></a>
+                      <a href="<?=$this->url('editLibraryCard') . $this->escapeHtmlAttr($record['id']) ?>" title="<?=$this->transEscAttr('Edit Library Card')?>"> <?=$this->transEsc('Add name')?></a>
                     <?php endif; ?>
                   </span>
                 <?php endif; ?>
@@ -76,10 +76,20 @@
               <td data-label="<?=$this->transEsc('Actions')?>" class="library-card-actions">
                 <div>
                   <?php if ($this->ils()->checkFunction('changePassword', (array)$record)): ?>
-                    <a class="btn-link change-library-card-password" href="<?=$this->url('newLibraryCardPassword') ?>?id=<?=$this->escapeHtmlAttr($record['id']) ?>" data-lightbox title="<?=$this->transEsc('Change Password')?>"><?=$this->icon('library-card-password') ?> <?=$this->transEsc('Change Password')?></a>
+                    <a class="icon-link change-library-card-password" href="<?=$this->url('newLibraryCardPassword') ?>?id=<?=$this->escapeHtmlAttr($record['id']) ?>" data-lightbox title="<?=$this->transEscAttr('Change Password')?>">
+                      <?=$this->icon('library-card-password', 'icon-link__icon') ?>
+                      <span class="icon-link__label">
+                        <?=$this->transEsc('Change Password')?>
+                      </span>
+                    </a>
                   <?php endif; ?>
                   <?php if ($this->auth()->getManager()->allowsUserIlsLogin()): ?>
-                    <a class="btn-link edit-library-card" href="<?=$this->url('editLibraryCard') . $this->escapeHtmlAttr($record['id']) ?>" title="<?=$this->transEsc('Edit Library Card')?>"><?=$this->icon('library-card-edit') ?> <?=$this->transEsc('Update Card Details')?></a>
+                    <a class="icon-link edit-library-card" href="<?=$this->url('editLibraryCard') . $this->escapeHtmlAttr($record['id']) ?>" title="<?=$this->transEscAttr('Edit Library Card')?>">
+                      <?=$this->icon('library-card-edit', 'icon-link__icon') ?>
+                      <span class="icon-link__label">
+                        <?=$this->transEsc('Update Card Details')?>
+                      </span>
+                    </a>
                   <?php endif; ?>
                   <?=
                     $this->component(
@@ -87,7 +97,7 @@
                         [
                           'buttonLink' => $this->url('librarycards-deletecard', [], ['query' => ['cardID' => $record['id']]]),
                           'buttonLabelHtml' => $this->icon('library-card-disconnect') . ' ' . $this->translate('Disconnect Library Card'),
-                          'buttonClass' => 'btn-link',
+                          'buttonClass' => 'btn-unstyled',
                           'confirmLink' => $this->url('librarycards-deletecard', [], ['query' => ['cardID' => $record['id'], 'confirm' => 1]]),
                           'header' => 'confirm_delete_library_card_brief',
                           'clearAccountCache' => true,
diff --git a/themes/finna2/templates/myresearch/login.phtml b/themes/finna2/templates/myresearch/login.phtml
index a24db552871..972edc370e9 100644
--- a/themes/finna2/templates/myresearch/login.phtml
+++ b/themes/finna2/templates/myresearch/login.phtml
@@ -28,7 +28,7 @@
 <?php else: ?>
   <?php if ($this->fromTermsPage): ?>
     <?php // Force lightbox login to display ?>
-    <div class="flash-message alert-danger hidden"></div>
+    <div class="flash-message alert alert-danger hidden"></div>
   <?php endif; ?>
   <?=$this->auth()->getLogin()?>
 <?php endif; ?>
diff --git a/themes/finna2/templates/myresearch/profile-my-information.phtml b/themes/finna2/templates/myresearch/profile-my-information.phtml
index 8ac76df7348..64542911758 100644
--- a/themes/finna2/templates/myresearch/profile-my-information.phtml
+++ b/themes/finna2/templates/myresearch/profile-my-information.phtml
@@ -46,7 +46,7 @@
             <option value="3" <?= $user->getFinnaDueDateReminder() == 3 ? 'selected="selected"' : '' ?>><?=$this->transEsc('due_date_reminder_three_days') ?></option>
           </select>
           <?php if ($user->getFinnaDueDateReminder() && empty($user->getEmail())): ?>
-            <span class="alert-danger"><?=$this->transEsc('no_email_address')?></span>
+            <span class="alert alert-danger"><?=$this->transEsc('no_email_address')?></span>
           <?php endif; ?>
         </div>
       </div>
diff --git a/themes/finna2/templates/search/advanced/usage_rights_ext_str_mv-facet-information-footer.phtml b/themes/finna2/templates/search/advanced/usage_rights_ext_str_mv-facet-information-footer.phtml
index 2955f77f227..dc8e503030c 100644
--- a/themes/finna2/templates/search/advanced/usage_rights_ext_str_mv-facet-information-footer.phtml
+++ b/themes/finna2/templates/search/advanced/usage_rights_ext_str_mv-facet-information-footer.phtml
@@ -1,5 +1,5 @@
 <!-- START of: finna - search/advanced/usage_rights_ext_str_mv-facet-information-footer.phtml -->
-<div class="information additional-info alert-info">  
+<div class="information additional-info alert alert-info">
     <p class="information-text"><?=$this->transEsc('usage_rights_ext_info')?></p>
     <a class="information-text" href="<?=$this->url('content-page', ['page' => 'terms'])?>#terms"><?=$this->transEsc('usage_rights_ext_info_more_link')?></a>
 </div>