diff --git a/app/assets/stylesheets/blacklight/_icons.scss b/app/assets/stylesheets/blacklight/_icons.scss
index e7c1c6f8c5..19311085c6 100644
--- a/app/assets/stylesheets/blacklight/_icons.scss
+++ b/app/assets/stylesheets/blacklight/_icons.scss
@@ -1,8 +1,8 @@
 .blacklight-icons {
   display: inline-block;
-  height: $font-size-root;
+  height: $font-size-base;
   vertical-align: text-top;
-  width: $font-size-root;
+  width: $font-size-base;
 }
 
 .btn-primary {
diff --git a/app/views/catalog/_facet_index_navigation.html.erb b/app/views/catalog/_facet_index_navigation.html.erb
index 04b7096718..d64fcc7684 100644
--- a/app/views/catalog/_facet_index_navigation.html.erb
+++ b/app/views/catalog/_facet_index_navigation.html.erb
@@ -1,7 +1,7 @@
 <nav class="alpha-filter">
-  <%= link_to t('blacklight.search.facets.clear'), @pagination.params_for_resort_url('index', search_state.to_h.except(@pagination.request_keys[:prefix])), data: { blacklight_modal: "preserve" }, class: ['btn btn-secondary btn-xs', ('disabled' unless @pagination.prefix.present?)].join(' ') %>
+  <%= link_to t('blacklight.search.facets.clear'), @pagination.params_for_resort_url('index', search_state.to_h.except(@pagination.request_keys[:prefix])), data: { blacklight_modal: "preserve" }, class: ['btn btn-secondary', ('disabled' unless @pagination.prefix.present?)].join(' ') %>
 
-  <ol class="pagination pagination-xs">
+  <ol class="pagination">
     <% @facet.index_range.each do |letter| %>
       <li class="<%= 'active' if @pagination.prefix == letter %>"><%= link_to(letter, @pagination.params_for_resort_url('index', search_state.to_h.merge(@pagination.request_keys[:prefix] => letter)), data: { blacklight_modal: "preserve" }) %></li>
     <% end %>
diff --git a/app/views/catalog/_facets.html.erb b/app/views/catalog/_facets.html.erb
index 0fbe7fa7f6..fa7af3baec 100644
--- a/app/views/catalog/_facets.html.erb
+++ b/app/views/catalog/_facets.html.erb
@@ -10,7 +10,7 @@
     </h2>
   </div>
 
-  <div id="facet-panel-collapse" class="collapse navbar-toggleable-xs">
+  <div id="facet-panel-collapse" class="navbar-toggleable">
     <%= render_facet_partials %>
   </div>
 </div>
diff --git a/app/views/catalog/_home_text.html.erb b/app/views/catalog/_home_text.html.erb
index 8ad76b541f..89bf1daa18 100644
--- a/app/views/catalog/_home_text.html.erb
+++ b/app/views/catalog/_home_text.html.erb
@@ -1,7 +1,7 @@
 <div class="jumbotron welcome clearfix row">
   <h2 class="page-heading"><%= t('blacklight.welcome') %></h2>
   <p class="lead">A multi-institutional open-source collaboration building a better discovery platform framework</p>
-  <nav class="nav nav-pills">
+  <nav class="nav-pills">
     <li class="nav-item">
       <a class="nav-link" href="https://github.com/projectblacklight/blacklight/">Github</a>
     </li>
@@ -42,4 +42,4 @@ to your own application: <br />
       $($(this).data('target')).load($(this).find('a').attr('href'));
     });
   });
-</script>
\ No newline at end of file
+</script>
diff --git a/app/views/catalog/_show_tools.html.erb b/app/views/catalog/_show_tools.html.erb
index 6b128c05f1..057833898e 100644
--- a/app/views/catalog/_show_tools.html.erb
+++ b/app/views/catalog/_show_tools.html.erb
@@ -13,7 +13,7 @@
   </div>
 
   <div class="card-block">
-    <ul class="nav nav-pills nav-stacked">
+    <ul class="nav-pills nav-stacked">
       <%= render_show_doc_actions @document do |config, inner| %>
         <li class="nav-item <%= config.key %>">
           <%= inner %>
diff --git a/app/views/shared/_header_navbar.html.erb b/app/views/shared/_header_navbar.html.erb
index 5c0292a5cd..8ab9441905 100644
--- a/app/views/shared/_header_navbar.html.erb
+++ b/app/views/shared/_header_navbar.html.erb
@@ -1,10 +1,10 @@
 <nav id="header-navbar" class="navbar navbar-dark bg-inverse navbar-full" role="navigation">
   <div class="<%= container_classes %>">
-    <button class="navbar-toggler hidden-xs-up" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation"></button>
+    <button class="navbar-toggler hidden-sm-up" type="button" data-toggle="collapse" data-target="#user-util-collapse" aria-controls="user-util-collapse" aria-expanded="false" aria-label="Toggle navigation"></button>
 
     <%= link_to application_name, root_path, class: "navbar-brand" %>
 
-    <div class="collapse navbar-toggleable-xs float-md-right" id="user-util-collapse">
+    <div class="collapse navbar-toggleable float-md-right" id="user-util-collapse">
       <%= render 'shared/user_util_links' %>
     </div>
   </div>
diff --git a/app/views/shared/_user_util_links.html.erb b/app/views/shared/_user_util_links.html.erb
index 8d058fc15d..f4391992c2 100644
--- a/app/views/shared/_user_util_links.html.erb
+++ b/app/views/shared/_user_util_links.html.erb
@@ -1,4 +1,4 @@
-<ul class="nav navbar-nav">
+<ul class="navbar-nav">
   <%= render_nav_actions do |config, action|%>
     <li class="nav-item"><%= action %></li>
   <% end %>