diff --git a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/FavoritesTest.php b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/FavoritesTest.php
index 0c1dc171fb7033740e539c9ba070066ef19233eb..187995fcaec06aac540db041b3354bbab62d2e84 100644
--- a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/FavoritesTest.php
+++ b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/FavoritesTest.php
@@ -159,7 +159,7 @@ class FavoritesTest extends \VuFindTest\Unit\MinkTestCase
         $this->snooze();
         $this->findCss($page, '.resultItemLine1 a')->click();
         $this->assertEquals($recordURL, $this->stripHash($session->getCurrentUrl()));
-        $this->findCss($page, '.logoutOptions a[title="Log Out"]')->click();
+        $this->findCss($page, '.logoutOptions a.logout')->click();
     }
 
     /**
@@ -306,7 +306,7 @@ class FavoritesTest extends \VuFindTest\Unit\MinkTestCase
         $this->findCss($page, '.resultItemLine1 a')->click();
         $this->snooze();
         $this->assertEquals($recordURL, $session->getCurrentUrl());
-        $this->findCss($page, '.logoutOptions a[title="Log Out"]')->click();
+        $this->findCss($page, '.logoutOptions a.logout')->click();
     }
 
     /**
diff --git a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/RecordActionsTest.php b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/RecordActionsTest.php
index ba696e103bd43349be1a336f926babd82e7e17d1..f161dfb61d94a76664cfc13ea6144a7fcc2ef801 100644
--- a/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/RecordActionsTest.php
+++ b/module/VuFind/tests/integration-tests/src/VuFindTest/Mink/RecordActionsTest.php
@@ -130,7 +130,7 @@ class RecordActionsTest extends \VuFindTest\Unit\MinkTestCase
         $this->snooze(); // wait for UI update
         $this->assertNull($page->find('css', '.comment.row'));
         // Logout
-        $this->findCss($page, '.logoutOptions a[title="Log Out"]')->click();
+        $this->findCss($page, '.logoutOptions a.logout')->click();
     }
 
     /**
@@ -163,7 +163,7 @@ class RecordActionsTest extends \VuFindTest\Unit\MinkTestCase
         $this->findCss($page, '.modal #addtag_tag');
         $this->findCss($page, '.modal .close')->click();
         $this->snooze(); // wait for display to update
-        $this->findCss($page, '.logoutOptions a[title="Log Out"]')->click();
+        $this->findCss($page, '.logoutOptions a.logout')->click();
         $this->snooze();
         // Login
         $page = $this->gotoRecord(); // redirects to search home???
@@ -203,7 +203,7 @@ class RecordActionsTest extends \VuFindTest\Unit\MinkTestCase
         }
         $this->assertEquals(3, $sum);
         // Log out
-        $this->findCss($page, '.logoutOptions a[title="Log Out"]')->click();
+        $this->findCss($page, '.logoutOptions a.logout')->click();
         $this->snooze(); // wait for UI update
 
         // Flat tags
@@ -231,7 +231,7 @@ class RecordActionsTest extends \VuFindTest\Unit\MinkTestCase
         $this->snooze();
         // Check selected == 0
         $this->assertNull($page->find('css', '.tagList .tag.selected'));
-        $this->findCss($page, '.logoutOptions a[title="Log Out"]')->click();
+        $this->findCss($page, '.logoutOptions a.logout')->click();
     }
 
     /**
@@ -281,7 +281,7 @@ class RecordActionsTest extends \VuFindTest\Unit\MinkTestCase
         // Check for confirmation message
         $this->findCss($page, '.modal .alert-success');
         // Logout
-        $this->findCss($page, '.logoutOptions a[title="Log Out"]')->click();
+        $this->findCss($page, '.logoutOptions a.logout')->click();
     }
 
     /**
diff --git a/themes/bootstrap3/js/lightbox.js b/themes/bootstrap3/js/lightbox.js
index c5fe50ad825367b593844b08b91bf826e6711a8c..6566d0dc468c68023d0ec76a37c125265b63ad1a 100644
--- a/themes/bootstrap3/js/lightbox.js
+++ b/themes/bootstrap3/js/lightbox.js
@@ -68,7 +68,7 @@ VuFind.lightbox = (function() {
   };
   var flashMessage = function(message, type) {
     _modalBody.find('.alert,.fa.fa-spinner').remove();
-    _modalBody.find('h2:first-child')
+    _modalBody.find('h2:first-of-type')
       .after('<div class="alert alert-'+type+'">'+message+'</div>');
   };
 
diff --git a/themes/bootstrap3/templates/header.phtml b/themes/bootstrap3/templates/header.phtml
index dc589305e6ea89030eba29156b886f064f322917..9064fdcce419123f5340e078ac01f97bfed6c1fb 100644
--- a/themes/bootstrap3/templates/header.phtml
+++ b/themes/bootstrap3/templates/header.phtml
@@ -30,7 +30,7 @@
             <a href="<?=$this->url('myresearch-home', array(), array('query' => array('redirect' => 0)))?>"><i class="fa fa-home"></i> <?=$this->transEsc("Your Account")?></a>
           </li>
           <li class="logoutOptions<? if(!$account->isLoggedIn()): ?> hidden<? endif ?>">
-            <a href="<?=$this->url('myresearch-logout')?>"><i class="fa fa-sign-out"></i> <?=$this->transEsc("Log Out")?></a>
+            <a href="<?=$this->url('myresearch-logout')?>" class="logout"><i class="fa fa-sign-out"></i> <?=$this->transEsc("Log Out")?></a>
           </li>
           <li id="loginOptions"<? if($account->isLoggedIn()): ?> class="hidden"<? endif ?>>
             <? if ($account->getSessionInitiator($this->serverUrl($this->url('myresearch-home')))): ?>