diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index 06fdfd396..d79a2b37f 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -214,6 +214,8 @@ a {
   margin-bottom: $line-height / 2;
 
   li {
+    font-size: $base-font-size;
+    margin-bottom: 0;
     margin-right: $line-height / 2;
 
     @include breakpoint(medium) {
diff --git a/app/views/polls/_poll_subnav.html.erb b/app/views/polls/_poll_subnav.html.erb
index 9b37e1867..8155e2ef4 100644
--- a/app/views/polls/_poll_subnav.html.erb
+++ b/app/views/polls/_poll_subnav.html.erb
@@ -1,21 +1,29 @@
-<div class="row">
+<div class="row margin-top">
   <div class="small-12 column">
-    <ul class="tabs">
-      <li class="tabs-title">
-        <%= link_to t("polls.show.results_menu"),
-                    poll_results_path(@poll),
-                    class: (controller_name == "polls" && action_name == "results" ? "is-active" : "") %>
-      </li>
-      <li class="tabs-title">
-        <%= link_to t("polls.show.stats_menu"),
-                    poll_stats_path(@poll),
-                    class: (controller_name == "polls" && action_name == "stats" ? "is-active" : "") %>
-      </li>
-      <li class="tabs-title is-active">
-        <%= link_to t("polls.show.info_menu"),
-                    poll_path(@poll),
-                    class: (controller_name == "polls" && action_name == "show" ? "is-active" : "") %>
-      </li>
+    <ul class="menu simple clear">
+      <% if controller_name == "polls" && action_name == "results" %>
+        <li class="active">
+          <h2><%= t("polls.show.results_menu") %></h2>
+        </li>
+      <% else %>
+        <li><%= link_to t("polls.show.results_menu"), poll_results_path(@poll) %></li>
+      <% end %>
+
+      <% if controller_name == "polls" && action_name == "stats" %>
+        <li class="active">
+          <h2><%= t("polls.show.stats_menu") %></h2>
+        </li>
+      <% else %>
+        <li><%= link_to t("polls.show.stats_menu"), poll_stats_path(@poll) %></li>
+      <% end %>
+
+      <% if controller_name == "polls" && action_name == "show" %>
+        <li class="active">
+          <h2><%= t("polls.show.info_menu") %></h2>
+        </li>
+      <% else %>
+        <li><%= link_to t("polls.show.info_menu"), poll_path(@poll) %></li>
+      <% end %>
     </ul>
   </div>
 </div>