diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 5b78fa374..128b21346 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -253,12 +253,21 @@ a {
       }
     }
 
-    &.active {
-      border-bottom: 2px solid $brand;
-      color: $brand;
+    & + li {
+      margin-left: 0;
     }
 
-    &:not(.active) {
+    &.is-active {
+      border-bottom: 2px solid $brand;
+      color: $brand;
+      padding-bottom: rem-calc(1);
+
+      h2 a {
+        color: $brand;
+      }
+    }
+
+    &:not(.is-active) {
       margin-bottom: $line-height / 3;
     }
   }
diff --git a/app/views/admin/legislation/processes/_subnav.html.erb b/app/views/admin/legislation/processes/_subnav.html.erb
index 0b8c55840..2bfa9dd1d 100644
--- a/app/views/admin/legislation/processes/_subnav.html.erb
+++ b/app/views/admin/legislation/processes/_subnav.html.erb
@@ -1,6 +1,6 @@
 <ul class="menu simple clear">
   <% if active == 'info' %>
-    <li class="active">
+    <li class="is-active">
       <h2><%= t("admin.legislation.processes.subnav.info") %></h2>
     </li>
   <% else %>
@@ -10,7 +10,7 @@
   <% end %>
 
   <% if active == 'questions' %>
-    <li class="active">
+    <li class="is-active">
       <h2><%= t("admin.legislation.processes.subnav.questions") %></h2>
     </li>
   <% else %>
@@ -20,7 +20,7 @@
   <% end %>
 
   <% if active == 'proposals' %>
-    <li class="active">
+    <li class="is-active">
       <h2><%= t("admin.legislation.processes.subnav.proposals") %></h2>
     </li>
   <% else %>
@@ -30,7 +30,7 @@
   <% end %>
 
   <% if active == 'draft_versions' %>
-    <li class="active">
+    <li class="is-active">
       <h2><%= t("admin.legislation.processes.subnav.draft_texts") %></h2>
     </li>
   <% else %>
diff --git a/app/views/admin/poll/polls/_subnav.html.erb b/app/views/admin/poll/polls/_subnav.html.erb
index 24d7a5b1f..98e23003b 100644
--- a/app/views/admin/poll/polls/_subnav.html.erb
+++ b/app/views/admin/poll/polls/_subnav.html.erb
@@ -1,6 +1,6 @@
 <ul class="menu simple clear" id="assigned-resources-tabs">
   <% if controller_name == "polls" %>
-    <li class="active">
+    <li class="is-active">
       <h2>
         <%= t("admin.polls.show.questions_tab") %>
         (<%= @poll.questions.count %>)
@@ -16,7 +16,7 @@
   <% end %>
 
   <% if controller_name == "booth_assignments" %>
-    <li class="active">
+    <li class="is-active">
       <h2>
         <%= t("admin.polls.show.booths_tab") %>
         (<%= @poll.booth_assignments.select(:booth_id).distinct.count %>)
@@ -32,7 +32,7 @@
   <% end %>
 
   <% if controller_name == "officer_assignments" %>
-    <li class="active">
+    <li class="is-active">
       <h2>
         <%= t("admin.polls.show.officers_tab") %>
         (<%= @poll.officer_assignments.select(:officer_id).distinct.count %>)
@@ -48,7 +48,7 @@
   <% end %>
 
   <% if controller_name == "recounts" %>
-    <li class="active">
+    <li class="is-active">
       <h2>
         <%= t("admin.polls.show.recounts_tab") %>
       </h2>
@@ -60,7 +60,7 @@
   <% end %>
 
   <% if controller_name == "results" %>
-    <li class="active">
+    <li class="is-active">
       <h2>
         <%= t("admin.polls.show.results_tab") %>
       </h2>
diff --git a/app/views/notifications/index.html.erb b/app/views/notifications/index.html.erb
index 132c9e15e..eccd3ec6a 100644
--- a/app/views/notifications/index.html.erb
+++ b/app/views/notifications/index.html.erb
@@ -10,7 +10,7 @@
             class: "button hollow float-right-medium" %>
 
     <ul class="menu simple clear">
-      <li class="active">
+      <li class="is-active">
         <h2><%= link_to t("notifications.index.unread"), notifications_path %></h2>
       </li>
       <li>
diff --git a/app/views/notifications/read.html.erb b/app/views/notifications/read.html.erb
index ec4d32c42..f5a2b68ae 100644
--- a/app/views/notifications/read.html.erb
+++ b/app/views/notifications/read.html.erb
@@ -7,7 +7,7 @@
       <li>
         <%= link_to t("notifications.index.unread"), notifications_path %>
       </li>
-      <li class="active">
+      <li class="is-active">
         <h2><%= link_to t("notifications.index.read"), read_notifications_path %></h2>
       </li>
     </ul>
diff --git a/app/views/polls/_poll_subnav.html.erb b/app/views/polls/_poll_subnav.html.erb
index 112f267ee..94d522dab 100644
--- a/app/views/polls/_poll_subnav.html.erb
+++ b/app/views/polls/_poll_subnav.html.erb
@@ -5,7 +5,7 @@
       <ul class="menu simple clear">
         <% if current_user && current_user.administrator? || @poll.results_enabled? %>
           <% if controller_name == "polls" && action_name == "results" %>
-            <li class="active">
+            <li class="is-active">
               <h2><%= t("polls.show.results_menu") %></h2>
             </li>
           <% else %>
@@ -15,7 +15,7 @@
 
         <% if current_user && current_user.administrator? || @poll.stats_enabled? %>
           <% if controller_name == "polls" && action_name == "stats" %>
-            <li class="active">
+            <li class="is-active">
               <h2><%= t("polls.show.stats_menu") %></h2>
             </li>
           <% else %>
@@ -24,7 +24,7 @@
         <% end %>
 
         <% if controller_name == "polls" && action_name == "show" %>
-          <li class="active">
+          <li class="is-active">
             <h2><%= t("polls.show.info_menu") %></h2>
           </li>
         <% else %>
diff --git a/app/views/shared/_filter_subnav.html.erb b/app/views/shared/_filter_subnav.html.erb
index 5a7e4d9d5..66d5ac273 100644
--- a/app/views/shared/_filter_subnav.html.erb
+++ b/app/views/shared/_filter_subnav.html.erb
@@ -3,7 +3,7 @@
 
   <% @valid_filters.each do |filter| %>
     <% if @current_filter == filter %>
-      <li class="active"><h2><%= t("#{i18n_namespace}.filters.#{filter}") %></h2></li>
+      <li class="is-active"><h2><%= t("#{i18n_namespace}.filters.#{filter}") %></h2></li>
     <% else %>
       <li><%= link_to t("#{i18n_namespace}.filters.#{filter}"),
         current_path_with_query_params(filter: filter, page: 1) %></li>
diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
index a4f739a28..3319ebbd3 100644
--- a/app/views/users/show.html.erb
+++ b/app/views/users/show.html.erb
@@ -27,7 +27,7 @@
           <% @valid_filters.each do |filter| %>
             <% if @activity_counts[filter] > 0 %>
               <% if @current_filter == filter %>
-                <li class="active">
+                <li class="is-active">
                   <h2><%= t("users.show.filters.#{filter}", count: @activity_counts[filter]) %></h2>
                 </li>
               <% else %>
diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index 951fa37c5..f46d5850d 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -440,7 +440,7 @@ feature 'Users' do
 
       visit user_path(@user, filter: "follows")
 
-      expect(page).to have_selector(".activity li.active", text: "1 Following")
+      expect(page).to have_selector(".activity li.is-active", text: "1 Following")
     end
 
     describe 'Proposals' do