diff --git a/app/views/discover/index.html.haml b/app/views/discover/index.html.haml
index 810b577a..5ea1f039 100644
--- a/app/views/discover/index.html.haml
+++ b/app/views/discover/index.html.haml
@@ -11,12 +11,12 @@
       %p= t 'views.discover.content.desc'
       %div{role: "tabpanel"}
         %ul.nav.nav-tabs{role: "tablist"}
-          %li.active{role: "presentation"}
-            %a{href: "#answers", role: "tab", aria: {controls: "answers"}, data: {toggle: "tab"}}= t 'views.discover.content.tab.answers'
-          %li{role: "presentation"}
-            %a{href: "#questions", role: "tab", aria: {controls: "questions"}, data: {toggle: "tab"}}= t 'views.discover.content.tab.questions'
-          %li{role: "presentation"}
-            %a{href: "#comments", role: "tab", aria: {controls: "comments"}, data: {toggle: "tab"}}= t 'views.discover.content.tab.comments'
+          %li.nav-item{role: "presentation"}
+            %a.nav-link.active{href: "#answers", role: "tab", aria: {controls: "answers"}, data: {toggle: "tab"}}= t 'views.discover.content.tab.answers'
+          %li.nav-item{role: "presentation"}
+            %a.nav-link{href: "#questions", role: "tab", aria: {controls: "questions"}, data: {toggle: "tab"}}= t 'views.discover.content.tab.questions'
+          %li.nav-item{role: "presentation"}
+            %a.nav-link{href: "#comments", role: "tab", aria: {controls: "comments"}, data: {toggle: "tab"}}= t 'views.discover.content.tab.comments'
         .tab-content.discover
           = render 'discover/tab_answers', answers: @popular_answers
           = render 'discover/tab_questions', questions: @popular_questions
@@ -26,12 +26,12 @@
       %p= t 'views.discover.people.desc'
       %div{role: "tabpanel"}
         %ul.nav.nav-tabs{role: "tablist"}
-          %li.active{role: "presentation"}
-            %a{href: "#new", role: "tab", aria: {controls: "new"}, data: {toggle: "tab"}}= t 'views.discover.people.tab.new'
-          %li{role: "presentation"}
-            %a{href: "#asked", role: "tab", aria: {controls: "asked"}, data: {toggle: "tab"}}= t 'views.discover.people.tab.questions'
-          %li{role: "presentation"}
-            %a{href: "#answered", role: "tab", aria: {controls: "answered"}, data: {toggle: "tab"}}= t 'views.discover.people.tab.answers'
+          %li.nav-item{role: "presentation"}
+            %a.nav-link.active{href: "#new", role: "tab", aria: {controls: "new"}, data: {toggle: "tab"}}= t 'views.discover.people.tab.new'
+          %li.nav-item{role: "presentation"}
+            %a.nav-link{href: "#asked", role: "tab", aria: {controls: "asked"}, data: {toggle: "tab"}}= t 'views.discover.people.tab.questions'
+          %li.nav-item{role: "presentation"}
+            %a.nav-link{href: "#answered", role: "tab", aria: {controls: "answered"}, data: {toggle: "tab"}}= t 'views.discover.people.tab.answers'
         .tab-content.discover
           = render 'discover/tab_new', new: @new_users
           = render 'discover/tab_asked', asked: @users_with_most_questions
diff --git a/app/views/modal/_group.haml b/app/views/modal/_group.haml
index 2d735306..ecb94df7 100644
--- a/app/views/modal/_group.haml
+++ b/app/views/modal/_group.haml
@@ -8,11 +8,11 @@
           %span.sr-only= t 'views.actions.close'
       %div{role: "tabpanel"}
         %ul.nav.nav-tabs{role: "tablist"}
-          %li.active{role: "presentation"}
-            %a{href: "#grouplist", aria: {controls: "grouplist"}, data: {toggle: "tab"}, role: "tab"}
+          %li.nav-item{role: "presentation"}
+            %a.nav-link.active{href: "#grouplist", aria: {controls: "grouplist"}, data: {toggle: "tab"}, role: "tab"}
               = t 'views.modal.group.tabs.main'
-          %li{role: "presentation"}
-            %a{href: "#create", aria: {controls: "create"}, data: {toggle: "tab"}, role: "tab"}
+          %li.nav-item{role: "presentation"}
+            %a.nav-link{href: "#create", aria: {controls: "create"}, data: {toggle: "tab"}, role: "tab"}
               = t 'views.modal.group.tabs.create'
 
         .tab-content